alibuild 1.17.2__tar.gz → 1.17.4__tar.gz

{alibuild-1.17.2/alibuild.egg-info → alibuild-1.17.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: alibuild
-Version: 1.17.2
+Version: 1.17.4
 Summary: ALICE Build Tool
 Home-page: https://alisw.github.io/alibuild
 Author: Giulio Eulisse

{alibuild-1.17.2 → alibuild-1.17.4/alibuild.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: alibuild
-Version: 1.17.2
+Version: 1.17.4
 Summary: ALICE Build Tool
 Home-page: https://alisw.github.io/alibuild
 Author: Giulio Eulisse

{alibuild-1.17.2 → alibuild-1.17.4}/alibuild_helpers/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.17.2'
-__version_tuple__ = version_tuple = (1, 17, 2)
+__version__ = version = '1.17.4'
+__version_tuple__ = version_tuple = (1, 17, 4)

{alibuild-1.17.2 → alibuild-1.17.4}/alibuild_helpers/git.py

@@ -2,6 +2,7 @@ from shlex import quote
 from alibuild_helpers.cmd import getstatusoutput
 from alibuild_helpers.log import debug
 from alibuild_helpers.scm import SCM, SCMError
+import os
 
 GIT_COMMAND_TIMEOUT_SEC = 120
 """How many seconds to let any git command execute before being terminated."""
@@ -75,6 +76,7 @@ class Git(SCM):
 
 
 def git(args, directory=".", check=True, prompt=True):
+  lastGitOverride = int(os.environ.get("GIT_CONFIG_COUNT", "0"))
   debug("Executing git %s (in directory %s)", " ".join(args), directory)
   # We can't use git --git-dir=%s/.git or git -C %s here as the former requires
   # that the directory we're inspecting to be the root of a git directory, not
@@ -84,12 +86,13 @@ def git(args, directory=".", check=True, prompt=True):
   err, output = getstatusoutput("""\
   set -e +x
   cd {directory} >/dev/null 2>&1
-  {prompt_var} git {args}
+  {prompt_var} {directory_safe_var} git {args}
   """.format(
     directory=quote(directory),
     args=" ".join(map(quote, args)),
     # GIT_TERMINAL_PROMPT is only supported in git 2.3+.
-    prompt_var="GIT_TERMINAL_PROMPT=0" if not prompt else "",
+    prompt_var=f"GIT_TERMINAL_PROMPT=0" if not prompt else "",
+    directory_safe_var=f"GIT_CONFIG_COUNT={lastGitOverride+1} GIT_CONFIG_KEY_{lastGitOverride}=safe.directory GIT_CONFIG_VALUE_{lastGitOverride}=$PWD" if directory else "",
   ), timeout=GIT_COMMAND_TIMEOUT_SEC)
   if check and err != 0:
     raise SCMError("Error {} from git {}: {}".format(err, " ".join(args), output))