add logs to git retry functionality

diff --git a/sat b/sat
index 14b9a86120235243cee480d70a73aaaca6715115..02c2b5745bdd8a8b4e41097c312f74ba0ce25e0b 100755 (executable)
--- a/sat
+++ b/sat
@@ -44,7 +44,7 @@ import src.debug as DBG # Easy print stderr (for DEBUG only)
 
 logger = LOG.getDefaultLogger()
 
-DBG.write("Python version", sys.version, DBG.isDeveloper())
+DBG.write("Python version", sys.version)
 
 #################################
 # MAIN

diff --git a/src/ElementTree.py b/src/ElementTree.py
index 8b1b92bf8f5c17bd0aa330263cbf4784e54ef3bb..1cfe8ceaa7d67e949530a37550325141d32172ad 100644 (file)
--- a/src/ElementTree.py
+++ b/src/ElementTree.py
@@ -13,7 +13,7 @@ _versionPython = sys.version_info[0]
 if _versionPython < 3:
   # python2 previous historic mode
   import src.ElementTreePython2 as etree
-  DBG.write("ElementTree Python2", etree.__file__, DBG.isDeveloper())
+  DBG.write("ElementTree Python2", etree.__file__)
   tostring = etree.tostring
 
 else:

diff --git a/src/system.py b/src/system.py
index 9d0f28556de2c4b72b98b6f12c3d3cba89d517fd..bb1fc1ac789fe1d38ad10cc969e29ea4e2040eae 100644 (file)
--- a/src/system.py
+++ b/src/system.py
@@ -97,10 +97,18 @@ git --git-dir=%(where_git)s --work-tree=%(where)s checkout %(tag)s
 
   DBG.write("cmd", cmd)
 
-  for nbtry in range(0,3): # retries case of network problem
+  # git commands may fail sometimes for various raisons (big module, network troubles, tuleap maintenance)
+  # therefore we give several tries
+  i_try=0
+  max_number_of_tries=3
+  sleep_delay=30  # seconds
+  while (True):
+    i_try+=1
     rc = UTS.Popen(cmd, cwd=str(where.dir()), env=environment.environ.environ, logger=logger)
-    if rc.isOk(): break
-    time.sleep(30) # wait a little
+    if rc.isOk() or (i_try>=max_number_of_tries):
+        break
+    logger.write('\ngit command failed! Wait %d seconds and give an other try (%d/%d)\n' % (sleep_delay,i_try+1,max_number_of_tries), 3)
+    time.sleep(sleep_delay) # wait a little
 
   return rc.isOk()
 
@@ -288,4 +296,4 @@ def svn_extract(user,
                           shell=True,
                           stdout=logger.logTxtFile,
                           stderr=subprocess.STDOUT)
-    return (res == 0)
\ No newline at end of file
+    return (res == 0)