spns #43062: fix issues for different git versions - Linux & Windows

diff --git a/commands/source.py b/commands/source.py
index 79c11df2cc3b0f59a639f49b1824a8cd1e519abb..50b2911aabe51953379eb9076650c2d25e7cff1f 100644 (file)
--- a/commands/source.py
+++ b/commands/source.py
@@ -141,6 +141,10 @@ def get_source_from_git(config,
     if "git_options" in product_info.git_info:
         git_options = product_info.git_info.git_options
 
+    git_commands= []
+    if "git_commands" in product_info.git_info:
+        git_commands = product_info.git_info.git_commands
+
     sub_dir = None
     # what do we do with git tree structure and history
     if is_dev and "sub_dir" in product_info.git_info:
@@ -153,13 +157,13 @@ def get_source_from_git(config,
     if sub_dir is None:
       # Call the system function that do the extraction in git mode
       retcode = src.system.git_extract(repo_git,
-                                   product_info.git_info.tag, git_options,
+                                   product_info.git_info.tag, git_options, git_commands,
                                    source_dir, logger, environ)
     else:
       # Call the system function that do the extraction of a sub_dir in git mode
       logger.write("sub_dir:%s " % sub_dir, 3)
       retcode = src.system.git_extract_sub_dir(repo_git,
-                                   product_info.git_info.tag,git_options,
+                                   product_info.git_info.tag,git_options, git_commands,
                                    source_dir, sub_dir, logger, environ)
 
 

diff --git a/src/system.py b/src/system.py
index 7b8d1492bbbb3082f4c9b0eb04b5c7ef74401c0a..7dbd2d3fc196d9dedb5c609136da8b496a59cbdc 100644 (file)
--- a/src/system.py
+++ b/src/system.py
@@ -117,13 +117,13 @@ def git_describe(repo_path):
             tag_description=tag_description.decode("utf-8", "ignore")
         return tag_description
 
-
-def git_extract(from_what, tag, git_options, where, logger, environment=None):
+def git_extract(from_what, tag, git_options, git_commands, where, logger, environment=None):
   '''Extracts sources from a git repository.
 87
   :param from_what str: The remote git repository.
   :param tag str: The tag.
   :param git_options str: git options
+  :param git_commands array: git command lines
   :param where str: The path where to extract.
   :param logger Logger: The logger instance to use.
   :param environment src.environment.Environ: The environment to source when extracting.
@@ -137,47 +137,67 @@ def git_extract(from_what, tag, git_options, where, logger, environment=None):
   if tag == "master" or tag == "HEAD":
     if src.architecture.is_windows():
       cmd = "git clone %(git_options)s %(remote)s %(where)s"
+      if len(git_commands) > 0:
+        cmd+= "&&" + "cd %(where)s"
+        for git_command in git_commands:
+          cmd+= "&&" + git_command
     else:
-      cmd = r"""
-set -x
-git clone %(git_options)s %(remote)s %(where)s
-res=$?
-if [ $res -eq 0 ]; then
-  touch -d "$(git --git-dir=%(where_git)s  log -1 --format=date_format)" %(where)s
-fi
-exit $res
-"""
-    cmd = cmd % {'git_options': git_options, 'remote': from_what, 'tag': tag, 'where': str(where), 'where_git': where_git}
+      cmd = "\n" + "set -x"
+      cmd+= "\n" + "git clone %(git_options)s %(remote)s %(where)s"
+      cmd+= "\n" + "if [ $? -ne 0 ]; then"
+      cmd+= "\n" + "  exit 1"
+      cmd+= "\n" + "fi"
+      cmd+= "\n" + "touch -d \"$(git --git-dir=%(where_git)s  log -1 --format=date_format)\" %(where)s"
+      cmd+= "\n" + "if [ $? -ne 0 ]; then"
+      cmd+= "\n" + "  exit 1"
+      cmd+= "\n" + "fi"
+      if len(git_commands) > 0:
+        cmd+= "\n" + "cd %(where)s"
+        for git_command in git_commands:
+            cmd+= "\n" + git_command
+            cmd+= "\n" + "if [ $? -ne 0 ]; then"
+            cmd+= "\n" + "  exit 1"
+            cmd+= "\n" + "fi"
   else:
-    # NOTICE: this command only works with recent version of git
-    #         because --work-tree does not work with an absolute path
     if src.architecture.is_windows():
-      cmd = "rmdir /S /Q %(where)s && git clone %(git_options)s %(remote)s %(where)s && git --git-dir=%(where_git)s --work-tree=%(where)s checkout %(tag)s"
+      cmd = "rmdir /S /Q %(where)s"
+      cmd+= "&&" + "git clone %(git_options)s %(remote)s %(where)s"
+      cmd+= "&&" + "git --git-dir=%(where_git)s --work-tree=%(where)s checkout %(tag)s"
+      if len(git_commands) > 0:
+        cmd+= "&&" + "cd %(where)s"
+        for git_command in git_commands:
+          cmd+= "&&" + git_command
     else:
-# for sat compile --update : changes the date of directory, only for branches, not tag
-      cmd = r"""
-set -x
-rm -rf %(where)s
-git clone %(git_options)s %(remote)s %(where)s && \
-git --git-dir=%(where_git)s --work-tree=%(where)s checkout %(tag)s
-res=$?
-git --git-dir=%(where_git)s status | grep HEAD
-if [ $res -eq 0 -a $? -ne 0 ]; then
-  touch -d "$(git --git-dir=%(where_git)s  log -1 --format=date_format)" %(where)s
-fi
-exit $res
-"""
-    cmd = cmd % {'git_options': git_options,
-                 'remote': from_what,
-                 'tag': tag,
-                 'where': str(where),
-                 'where_git': where_git}
-
-
+      cmd = "\n" + "set -x"
+      cmd+= "\n" + "git clone %(git_options)s %(remote)s %(where)s"
+      cmd+= "\n" + "if [ $? -ne 0 ]; then"
+      cmd+= "\n" + "  exit 1"
+      cmd+= "\n" + "fi"
+      cmd+= "\n" + "git --git-dir=%(where_git)s --work-tree=%(where)s checkout %(tag)s"
+      cmd+= "\n" + "if [ $? -ne 0 ]; then"
+      cmd+= "\n" + "  exit 1"
+      cmd+= "\n" + "fi"
+      if len(git_commands) > 0:
+        cmd+= "\n" + "cd %(where)s"
+        for git_command in git_commands:
+            cmd+= "\n" + git_command
+            cmd+= "\n" + "if [ $? -ne 0 ]; then"
+            cmd+= "\n" + "  exit 1"
+            cmd+= "\n" + "fi"
+      cmd+= "\n" + "git --git-dir=%(where_git)s status | grep HEAD"
+      cmd+= "\n" + "touch -d \"$(git --git-dir=%(where_git)s  log -1 --format=date_format)\" %(where)s"
+      cmd+= "\n" + "exit 0"
+  aDict = {'%(git_options)s': git_options,
+           '%(remote)s'   : from_what,
+           '%(where)s'    : str(where),
+           '%(tag)s'      : tag,
+           '%(where_git)s': where_git
+           }
+  for k, v in aDict.items():
+      cmd= cmd.replace(k,v)
   cmd=cmd.replace('date_format', '"%ai"')
   logger.logTxtFile.write("\n" + cmd + "\n")
   logger.logTxtFile.flush()
-
   DBG.write("cmd", cmd)
   # git commands may fail sometimes for various raisons 
   # (big module, network troubles, tuleap maintenance)
@@ -197,12 +217,13 @@ exit $res
   return rc.isOk()
 
 
-def git_extract_sub_dir(from_what, tag, git_options, where, sub_dir, logger, environment=None):
+def git_extract_sub_dir(from_what, tag, git_options, git_commands, where, sub_dir, logger, environment=None):
   '''Extracts sources from a subtree sub_dir of a git repository.
 
   :param from_what str: The remote git repository.
   :param tag str: The tag.
   :param git_options str: git options
+  :param git_commands array: git command lines
   :param where str: The path where to extract.
   :param sub_dir str: The relative path of subtree to extract.
   :param logger Logger: The logger instance to use.
@@ -219,40 +240,55 @@ def git_extract_sub_dir(from_what, tag, git_options, where, sub_dir, logger, env
   if os.path.isdir(strWhere):
     logger.error("do not override existing directory: %s" % strWhere)
     return False
-  aDict = {'git_options': git_options,
-           'remote': from_what,
-           'tag': tag,
-           'sub_dir': sub_dir,
-           'where': strWhere,
-           'parentWhere': parentWhere,
-           'tmpWhere': tmpWhere,
+  aDict = {'%(git_options)s': git_options,
+           '%(remote)s'     : from_what,
+           '%(tag)s'        : tag,
+           '%(sub_dir)s'    : sub_dir,
+           '%(where)s'      : strWhere,
+           '%(parentWhere)s': parentWhere,
+           '%(tmpWhere)s'   : tmpWhere
            }
   DBG.write("git_extract_sub_dir", aDict)
   if not src.architecture.is_windows():
-    cmd = r"""
-set -x
-export tmpDir=%(tmpWhere)s && \
-rm -rf $tmpDir
-git clone %(git_options)s %(remote)s $tmpDir && \
-cd $tmpDir && \
-git checkout %(tag)s && \
-mv %(sub_dir)s %(where)s && \
-git log -1 > %(where)s/README_git_log.txt && \
-rm -rf $tmpDir
-""" % aDict
+    cmd = "\n" + "set -x"
+    cmd+= "\n" + "export tmpDir=%(tmpWhere)s"
+    cmd+= "\n" + "rm -rf $tmpDir"
+    cmd+= "\n" + "git clone %(git_options)s %(remote)s $tmpDir"
+    cmd+= "\n" + "if [ $? -ne 0 ]; then"
+    cmd+= "\n" + "  exit 1"
+    cmd+= "\n" + "fi"
+    cmd+= "\n" + "cd $tmpDir"
+    cmd+= "\n" + "git checkout %(tag)s"
+    cmd+= "\n" + "if [ $? -ne 0 ]; then"
+    cmd+= "\n" + "  exit 1"
+    cmd+= "\n" + "fi"
+    if len(git_commands) > 0:
+      for git_command in git_commands:
+        cmd+= "\n" + git_command
+        cmd+= "\n" + "if [ $? -ne 0 ]; then"
+        cmd+= "\n" + "  exit 1"
+        cmd+= "\n" + "fi"
+    cmd+= "\n" + "mv %(sub_dir)s %(where)s"
+    cmd+= "\n" + "git log -1 > %(where)s/README_git_log.txt"
+    cmd+= "\n" + "if [ $? -ne 0 ]; then"
+    cmd+= "\n" + "  exit 1"
+    cmd+= "\n" + "fi"
+    cmd+= "\n" + "rm -rf ${tmpDir}"
   else:
-    cmd = r"""
-
-set tmpDir=%(tmpWhere)s && \
-rmdir /S /Q %tmpDir%
-git clone %(git_options)s %(remote)s %tmpDir% && \
-cd %tmpDir% && \
-git checkout %(tag)s && \
-mv %(sub_dir)s %(where)s && \
-git log -1 > %(where)s\\README_git_log.txt && \
-rmdir /S /Q %tmpDir%
-""" % aDict
-
+    cmd+=        "set tmpDir=%(tmpWhere)s"
+    cmd+= "&&" + "rmdir /S /Q %tmpDir%"
+    cmd+= "&&" + "git clone %(git_options)s %(remote)s %tmpDir%"
+    cmd+= "&&" + "cd %tmpDir%"
+    cmd+= "&&" + "git checkout %(tag)s"
+    if len(git_commands) > 0:
+      for git_command in git_commands:
+        cmd+= "&&" + git_command
+    cmd+= "&&" + "mv %(sub_dir)s %(where)s"
+    cmd+= "&&" + "git log -1 > %(where)s\\README_git_log.txt"
+    cmd+= "&&" + "rmdir /S /Q %tmpDir%"
+
+  for k, v in aDict.items():
+      cmd= cmd.replace(k,v)
   DBG.write("cmd", cmd)
 
   for nbtry in range(0,3): # retries case of network problem