alibuild 1.17.35__tar.gz → 1.17.36__tar.gz

{alibuild-1.17.35 → alibuild-1.17.36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alibuild
-Version: 1.17.35
+Version: 1.17.36
 Summary: ALICE Build Tool
 Home-page: https://alisw.github.io/alibuild
 Author: Giulio Eulisse
@@ -17,7 +17,7 @@ Requires-Dist: pyyaml
 Requires-Dist: requests
 Requires-Dist: distro
 Requires-Dist: jinja2
-Requires-Dist: boto3<1.36.0
+Requires-Dist: boto3
 Provides-Extra: test
 Requires-Dist: tox; extra == "test"
 Provides-Extra: docs

{alibuild-1.17.35 → alibuild-1.17.36}/alibuild.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alibuild
-Version: 1.17.35
+Version: 1.17.36
 Summary: ALICE Build Tool
 Home-page: https://alisw.github.io/alibuild
 Author: Giulio Eulisse
@@ -17,7 +17,7 @@ Requires-Dist: pyyaml
 Requires-Dist: requests
 Requires-Dist: distro
 Requires-Dist: jinja2
-Requires-Dist: boto3<1.36.0
+Requires-Dist: boto3
 Provides-Extra: test
 Requires-Dist: tox; extra == "test"
 Provides-Extra: docs

{alibuild-1.17.35 → alibuild-1.17.36}/alibuild.egg-info/requires.txt

@@ -2,7 +2,7 @@ pyyaml
 requests
 distro
 jinja2
-boto3<1.36.0
+boto3
 
 [docs]
 mkdocs

{alibuild-1.17.35 → alibuild-1.17.36}/alibuild_helpers/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.17.35'
-__version_tuple__ = version_tuple = (1, 17, 35)
+__version__ = version = '1.17.36'
+__version_tuple__ = version_tuple = (1, 17, 36)
 
-__commit_id__ = commit_id = 'g23eed7df6'
+__commit_id__ = commit_id = 'g8f166593e'

{alibuild-1.17.35 → alibuild-1.17.36}/alibuild_helpers/analytics.py

@@ -72,7 +72,7 @@ def report(eventType, **metadata):
   ostype = "Macintosh" if architecture.startswith("osx") else "Linux"
   osversion, osprocessor = architecture.split("_", 1)
   args = ["curl", "--max-time", "5",
-          "--user-agent", "aliBuild/%s (%s; %s %s) Python/%s" % (
+          "--user-agent", "aliBuild/{} ({}; {} {}) Python/{}".format(
                                                     os.environ["ALIBUILD_VERSION"],
                                                     ostype,
                                                     osprocessor,
@@ -89,7 +89,7 @@ def report(eventType, **metadata):
            "https://www.google-analytics.com/collect"]
   try:
     subprocess.Popen(args)
-  except:
+  except Exception:
     pass
 
 def report_event(category, action, label = "", value = None):

{alibuild-1.17.35 → alibuild-1.17.36}/alibuild_helpers/args.py

@@ -206,6 +206,8 @@ def doParseArgs():
                            help=("Assume we're not building %(metavar)s and all its (unique) dependencies. "
                                  "You can specify this option multiple times or separate multiple arguments "
                                  "with commas."))
+  deps_parser.add_argument("-e", dest="environment", action="append", default=[],
+                           help="KEY=VALUE binding to add to the environment. May be specified multiple times.")
 
   deps_graph = deps_parser.add_argument_group(title="Customise graph output")
   deps_graph.add_argument("--neat", dest="neat", action="store_true",
@@ -482,7 +484,7 @@ def finaliseArgs(args, parser):
       else:
         args.develPrefix = basename(dirname(abspath(args.configDir)))
     if getattr(args, "docker", False):
-      args.develPrefix = "%s-%s" % (args.develPrefix, args.architecture) if "develPrefix" in args else args.architecture
+      args.develPrefix = f"{args.develPrefix}-{args.architecture}" if "develPrefix" in args else args.architecture
 
   if args.action == "init":
     args.configDir = args.configDir % {"prefix": args.develPrefix + "/"}

{alibuild-1.17.35 → alibuild-1.17.36}/alibuild_helpers/build.py

@@ -1,5 +1,6 @@
 from os.path import abspath, exists, basename, dirname, join, realpath
 from os import makedirs, unlink, readlink, rmdir
+from pathlib import Path
 from alibuild_helpers import __version__
 from alibuild_helpers.analytics import report_event
 from alibuild_helpers.log import debug, info, banner, warning
@@ -19,7 +20,6 @@ from alibuild_helpers.sync import remote_from_url
 from alibuild_helpers.workarea import logged_scm, updateReferenceRepoSpec, checkout_sources
 from alibuild_helpers.log import ProgressPrint, log_current_package
 from glob import glob
-from textwrap import dedent
 from collections import OrderedDict
 from shlex import quote
 import tempfile
@@ -31,6 +31,7 @@ import socket
 import os
 import re
 import shutil
+import sys
 import time
 
 
@@ -43,7 +44,7 @@ def writeAll(fn, txt) -> None:
 def readHashFile(fn):
   try:
     return open(fn).read().strip("\n")
-  except IOError:
+  except OSError:
     return "0"
 
 
@@ -55,11 +56,9 @@ def update_git_repos(args, specs, buildOrder):
     """
 
     def update_repo(package, git_prompt):
-        specs[package]["scm"] = Git()
-        if specs[package]["is_devel_pkg"]:
-            specs[package]["source"] = os.path.join(os.getcwd(), specs[package]["package"])
-            if exists(os.path.join(specs[package]["source"], ".sl")) or exists(os.path.join(specs[package]["source"], ".git/sl")):
-                specs[package]["scm"] = Sapling()
+        # Note: spec["scm"] should already be initialized before this is called
+        # This function just updates the repository and fetches refs
+        assert "scm" in specs[package], f"specs[{package!r}] has no scm key"
         updateReferenceRepoSpec(args.referenceSources, package, specs[package],
                                 fetch=args.fetchRepos, allowGitPrompt=git_prompt)
 
@@ -195,7 +194,7 @@ def storeHashes(package, specs, considerRelocation):
       # spec["env"] is of type OrderedDict[str, str].
       # spec["*_path"] are of type OrderedDict[str, list[str]].
       assert isinstance(spec[key], OrderedDict), \
-        "spec[%r] was of type %r" % (key, type(spec[key]))
+        f"spec[{key!r}] was of type {type(spec[key])!r}"
 
       # Python 3.12 changed the string representation of OrderedDicts from
       # OrderedDict([(key, value)]) to OrderedDict({key: value}), so to remain
@@ -204,7 +203,7 @@ def storeHashes(package, specs, considerRelocation):
       h_all(", ".join(
         # XXX: We still rely on repr("str") being "'str'",
         # and on repr(["a", "b"]) being "['a', 'b']".
-        "(%r, %r)" % (key, value)
+        f"({key!r}, {value!r})"
         for key, value in spec[key].items()
       ))
       h_all("])")
@@ -272,7 +271,7 @@ def hash_local_changes(spec):
   h = Hasher()
   if "track_env" in spec:
     assert isinstance(spec["track_env"], OrderedDict), \
-        "spec[%r] was of type %r" % ("track_env", type(spec["track_env"]))
+        "spec[{!r}] was of type {!r}".format("track_env", type(spec["track_env"]))
 
     # Python 3.12 changed the string representation of OrderedDicts from
     # OrderedDict([(key, value)]) to OrderedDict({key: value}), so to remain
@@ -281,7 +280,7 @@ def hash_local_changes(spec):
     h(", ".join(
         # XXX: We still rely on repr("str") being "'str'",
         # and on repr(["a", "b"]) being "['a', 'b']".
-        "(%r, %r)" % (key, value) for key, value in spec["track_env"].items()))
+        f"({key!r}, {value!r})" for key, value in spec["track_env"].items()))
     h("])")
   def hash_output(msg, args):
     lines = msg % args
@@ -365,6 +364,7 @@ def generate_initdotsh(package, specs, architecture, post_build=False):
       commit_hash=quote(spec["commit_hash"]),
     ) for line in (
       'export {bigpackage}_ROOT="$WORK_DIR/$ALIBUILD_ARCH_PREFIX"/{package}/{version}-{revision}',
+      'export RECC_PREFIX_MAP="${bigpackage}_ROOT=/recc/{bigpackage}_ROOT:$RECC_PREFIX_MAP"',
       "export {bigpackage}_VERSION={version}",
       "export {bigpackage}_REVISION={revision}",
       "export {bigpackage}_HASH={hash}",
@@ -380,12 +380,12 @@ def generate_initdotsh(package, specs, architecture, post_build=False):
     # First, output a sensible error message if types are wrong.
     for key in ("env", "append_path", "prepend_path"):
       dieOnError(not isinstance(spec.get(key, {}), dict),
-                 "Tag `%s' in %s should be a dict." % (key, package))
+                 f"Tag `{key}' in {package} should be a dict.")
 
     # Set "env" variables.
     # We only put the values in double-quotes, so that they can refer to other
     # shell variables or do command substitution (e.g. $(brew --prefix ...)).
-    lines.extend('export {}="{}"'.format(key, value)
+    lines.extend(f'export {key}="{value}"'
                  for key, value in spec.get("env", {}).items()
                  if key != "DYLD_LIBRARY_PATH")
 
@@ -402,7 +402,7 @@ def generate_initdotsh(package, specs, architecture, post_build=False):
     # By default we add the .../bin directory to PATH and .../lib to LD_LIBRARY_PATH.
     # Prepend to these paths, so that our packages win against system ones.
     for key, value in (("PATH", "bin"), ("LD_LIBRARY_PATH", "lib")):
-      prepend_path.setdefault(key, []).insert(0, "${}_ROOT/{}".format(bigpackage, value))
+      prepend_path.setdefault(key, []).insert(0, f"${bigpackage}_ROOT/{value}")
     lines.extend('export {key}="{value}${{{key}+:${key}}}"'
                  .format(key=key, value=":".join(value))
                  for key, value in prepend_path.items()
@@ -482,12 +482,17 @@ def doBuild(args, parser):
 
   makedirs(join(workDir, "SPECS"), exist_ok=True)
 
-  # If the alidist workdir contains a .sl directory, we use Sapling as SCM.
-  # Otherwise, we default to git (without checking for the actual presence of
-  # .git). We mustn't check for a .git directory, because some tests use a
-  # subdirectory of the alibuild source tree as the "alidist" checkout, and
-  # that won't have a .git directory.
-  scm = exists("%s/.sl" % args.configDir) and Sapling() or Git()
+  # If the alidist workdir contains a .sl directory (or .git/sl for git repos
+  # with Sapling enabled), we use Sapling as SCM. Otherwise, we default to git
+  # (without checking for the actual presence of .git). We mustn't check for a
+  # .git directory, because some tests use a subdirectory of the alibuild source
+  # tree as the "alidist" checkout, and that won't have a .git directory.
+  config_path = Path(args.configDir)
+  has_sapling = (config_path / ".sl").exists() or (config_path / ".git" / "sl").exists()
+  if has_sapling and shutil.which("sl"):
+    scm = Sapling()
+  else:
+    scm = Git()
   try:
     checkedOutCommitName = scm.checkedOutCommitName(directory=args.configDir)
   except SCMError:
@@ -563,13 +568,13 @@ def doBuild(args, parser):
     del develCandidates, develCandidatesUpper, develPkgsUpper
 
   if buildOrder:
-    if args.onlyDeps: 
+    if args.onlyDeps:
       builtPackages = buildOrder[:-1]
     else:
       builtPackages = buildOrder
     if len(builtPackages) > 1:
       banner("Packages will be built in the following order:\n - %s",
-             "\n - ".join(x+" (development package)" if x in develPkgs else "%s@%s" % (x, specs[x]["tag"])
+             "\n - ".join(x+" (development package)" if x in develPkgs else "{}@{}".format(x, specs[x]["tag"])
                           for x in builtPackages if x != "defaults-release"))
     else:
       banner("No dependencies of package %s to build.", buildOrder[-1])
@@ -587,11 +592,18 @@ def doBuild(args, parser):
 
   for pkg, spec in specs.items():
     spec["is_devel_pkg"] = pkg in develPkgs
-    spec["scm"] = Git()
     if spec["is_devel_pkg"]:
-      spec["source"] = os.path.join(os.getcwd(), pkg)
-    if "source" in spec and exists(os.path.join(spec["source"], ".sl")):
-      spec["scm"] = Sapling()
+      spec["source"] = str(Path.cwd() / pkg)
+
+    # Only initialize Sapling if it's in PATH and the repo uses it
+    use_sapling = False
+    if "source" in spec:
+        source_path = Path(spec["source"])
+        has_sapling = ( (source_path / ".sl").exists() or (source_path / ".git" / "sl").exists() )
+        if has_sapling and shutil.which("sl"):
+            use_sapling = True
+    spec["scm"] = Sapling() if use_sapling else Git()
+
     reference_repo = join(os.path.abspath(args.referenceSources), pkg.lower())
     if exists(reference_repo):
       spec["reference"] = reference_repo
@@ -817,7 +829,7 @@ def doBuild(args, parser):
       develPrefix = possibleDevelPrefix
 
     if possibleDevelPrefix:
-      spec["build_family"] = "%s-%s" % (possibleDevelPrefix, args.defaults)
+      spec["build_family"] = f"{possibleDevelPrefix}-{args.defaults}"
     else:
       spec["build_family"] = args.defaults
     if spec["package"] == mainPackage:
@@ -937,7 +949,7 @@ def doBuild(args, parser):
 
     # Now that we have all the information about the package we want to build, let's
     # check if it wasn't built / unpacked already.
-    hashPath= "%s/%s/%s/%s-%s" % (workDir,
+    hashPath= "{}/{}/{}/{}-{}".format(workDir,
                                   args.architecture,
                                   spec["package"],
                                   spec["version"],
@@ -980,12 +992,12 @@ def doBuild(args, parser):
           unlink(join(buildWorkDir, "BUILD", spec["package"] + "-latest"))
           if "develPrefix" in args:
             unlink(join(buildWorkDir, "BUILD", spec["package"] + "-latest-" + args.develPrefix))
-        except:
+        except Exception:
           pass
         try:
           rmdir(join(buildWorkDir, "BUILD"))
           rmdir(join(workDir, "INSTALLROOT"))
-        except:
+        except Exception:
           pass
       continue
 
@@ -1008,15 +1020,10 @@ def doBuild(args, parser):
 
     # The actual build script.
     debug("spec = %r", spec)
-
-    cmd_raw = ""
-    try:
-      fp = open(dirname(realpath(__file__))+'/build_template.sh', 'r')
-      cmd_raw = fp.read()
-      fp.close()
-    except:
-      from pkg_resources import resource_string
-      cmd_raw = resource_string("alibuild_helpers", 'build_template.sh')
+    
+    fp = open(dirname(realpath(__file__))+'/build_template.sh')
+    cmd_raw = fp.read()
+    fp.close()
 
     if args.docker:
       cachedTarball = re.sub("^" + workDir, "/sw", spec["cachedTarball"])
@@ -1030,7 +1037,7 @@ def doBuild(args, parser):
                      spec["version"] + "-" + spec["revision"])
 
     makedirs(scriptDir, exist_ok=True)
-    writeAll("%s/%s.sh" % (scriptDir, spec["package"]), spec["recipe"])
+    writeAll("{}/{}.sh".format(scriptDir, spec["package"]), spec["recipe"])
     writeAll("%s/build.sh" % scriptDir, cmd_raw % {
       "provenance": create_provenance_info(spec["package"], specs, args),
       "initdotsh_deps": generate_initdotsh(p, specs, args.architecture, post_build=False),
@@ -1093,7 +1100,7 @@ def doBuild(args, parser):
         scriptDir=quote(scriptDir),
         extraArgs=" ".join(map(quote, args.docker_extra_args)),
         additionalEnv=" ".join(
-          "-e {}={}".format(var, quote(value)) for var, value in buildEnvironment),
+          f"-e {var}={quote(value)}" for var, value in buildEnvironment),
         # Used e.g. by O2DPG-sim-tests to find the O2DPG repository.
         develVolumes=" ".join(
           '-v "$PWD/$(readlink {pkg} || echo {pkg})":/{pkg}:rw'.format(pkg=quote(spec["package"]))
@@ -1105,12 +1112,14 @@ def doBuild(args, parser):
       )
     else:
       os.environ.update(buildEnvironment)
-      build_command = "%s -e -x %s/build.sh 2>&1" % (BASH, quote(scriptDir))
+      build_command = f"{BASH} -e -x {quote(scriptDir)}/build.sh 2>&1"
 
     debug("Build command: %s", build_command)
+    progress_msg = "Unpacking %s@%s" if cachedTarball else "Compiling %s@%s"
+    if not cachedTarball and not args.debug:
+      progress_msg += " (use --debug for full output)"
     progress = ProgressPrint(
-      ("Unpacking %s@%s" if cachedTarball else
-       "Compiling %s@%s (use --debug for full output)") %
+      progress_msg %
       (spec["package"],
        args.develPrefix if "develPrefix" in args and spec["is_devel_pkg"] else spec["version"])
     )
@@ -1127,51 +1136,100 @@ def doBuild(args, parser):
     if spec["is_devel_pkg"]:
       updatablePkgs.append(spec["package"])
 
-    buildErrMsg = dedent("""\
-    Error while executing {sd}/build.sh on `{h}'.
-    Log can be found in {w}/BUILD/{p}-latest{devSuffix}/log
-    Please upload it to CERNBox/Dropbox if you intend to request support.
-    Build directory is {w}/BUILD/{p}-latest{devSuffix}/{p}.
-    """).format(
-      h=socket.gethostname(),
-      sd=scriptDir,
-      w=buildWorkDir,
-      p=spec["package"],
-      devSuffix="-" + args.develPrefix
-      if "develPrefix" in args and spec["is_devel_pkg"]
-      else "",
-    )
-    if updatablePkgs:
-      buildErrMsg += dedent("""
-      Note that you have packages in development mode.
-      Devel sources are not updated automatically, you must do it by hand.\n
-      This problem might be due to one or more outdated devel sources.
-      To update all development packages required for this build it is usually sufficient to do:
-      """)
-      buildErrMsg += "".join("\n  ( cd %s && git pull --rebase )" % dp for dp in updatablePkgs)
+    # Determine paths
+    devSuffix = "-" + args.develPrefix if "develPrefix" in args and spec["is_devel_pkg"] else ""
+    log_path = f"{buildWorkDir}/BUILD/{spec['package']}-latest{devSuffix}/log"
+    build_dir = f"{buildWorkDir}/BUILD/{spec['package']}-latest{devSuffix}/{spec['package']}"
+
+    # Use relative paths if we're inside the work directory
+    try:
+      from os.path import relpath
+      log_path = relpath(log_path, os.getcwd())
+      build_dir = relpath(build_dir, os.getcwd())
+    except (ValueError, OSError):
+      pass  # Keep absolute paths if relpath fails
+
+    # Color codes for error message (if TTY)
+    bold = "\033[1m" if sys.stderr.isatty() else ""
+    red = "\033[31m" if sys.stderr.isatty() else ""
+    reset = "\033[0m" if sys.stderr.isatty() else ""
+
+    # Build the error message
+    devel_note = " (development package)" if spec["is_devel_pkg"] else ""
+    buildErrMsg = f"{red}{bold}BUILD FAILED:{reset} {spec['package']}@{spec['version']}{devel_note}\n"
+    buildErrMsg += "=" * 70 + "\n\n"
+
+    buildErrMsg += f"{bold}Log File:{reset}\n"
+    buildErrMsg += f"  {log_path}\n\n"
+
+    buildErrMsg += f"{bold}Build Directory:{reset}\n"
+    buildErrMsg += f"  {build_dir}\n"
 
     # Gather build info for the error message
     try:
+      detected_arch = detectArch()
+
+      # Only show safe arguments (no tokens/secrets) in CLI-usable format
       safe_args = {
         "pkgname", "defaults", "architecture", "forceUnknownArch",
         "develPrefix", "jobs", "noSystem", "noDevel", "forceTracked", "plugin",
         "disable", "annotate", "onlyDeps", "docker"
-          }
-      args_str = " ".join(f"--{k}={v}" for k, v in vars(args).items() if v and k in safe_args)
-      detected_arch = detectArch()
-      buildErrMsg += dedent(f"""
-      Build info:
-      OS: {detected_arch}
-      Using aliBuild from alibuild@{__version__ or "unknown"} recipes in alidist@{os.environ["ALIBUILD_ALIDIST_HASH"][:10]}
-      Build arguments: {args_str}
-      """)
+      }
+      
+      cli_args = []
+      for k, v in vars(args).items():
+        if not v or k not in safe_args:
+          continue
+        
+        # Format based on type for CLI usage
+        if isinstance(v, bool):
+          if v:  # Only show if True
+            cli_args.append(f"--{k}")
+        elif isinstance(v, list):
+          if v:  # Only show non-empty lists
+            # For lists, use multiple --flag value or --flag=val1,val2
+            for item in v:
+              cli_args.append(f"--{k}={quote(str(item))}")
+        else:
+          # Quote if needed
+          cli_args.append(f"--{k}={quote(str(v))}")
+      
+      args_str = " ".join(cli_args)
+
+      buildErrMsg += f"\n{bold}Environment:{reset}\n"
+      buildErrMsg += f"  OS: {detected_arch}\n"
+      buildErrMsg += f"  aliBuild: {__version__ or 'unknown'} (alidist@{os.environ['ALIBUILD_ALIDIST_HASH'][:10]})\n"
 
       if detected_arch.startswith("osx"):
-        buildErrMsg += f'XCode version: {getstatusoutput("xcodebuild -version")[1]}'
+        xcode_info = getstatusoutput("xcodebuild -version")[1]
+        # Combine XCode version lines into one
+        xcode_lines = xcode_info.strip().split('\n')
+        if len(xcode_lines) >= 2:
+          xcode_str = f"{xcode_lines[0]} ({xcode_lines[1]})"
+        else:
+          xcode_str = xcode_lines[0] if xcode_lines else "Unknown"
+        buildErrMsg += f"  XCode: {xcode_str}\n"
+
+      buildErrMsg += f"  Arguments: {args_str}\n"
 
     except Exception as exc:
       warning("Failed to gather build info", exc_info=exc)
 
+    # Add note about development packages if applicable
+    if updatablePkgs:
+      buildErrMsg += f"\n{bold}Development Packages:{reset}\n"
+      buildErrMsg += "  Development sources are not updated automatically.\n"
+      buildErrMsg += "  This may be due to outdated sources. To update:\n"
+      buildErrMsg += "".join(f"\n    ( cd {dp} && git pull --rebase )" for dp in updatablePkgs)
+      buildErrMsg += "\n"
+
+    # Add Next Steps section
+    buildErrMsg += f"\n{bold}Next Steps:{reset}\n"
+    buildErrMsg += f"  • View error log:          cat {log_path}\n"
+    if not args.debug:
+      buildErrMsg += f"  • Rebuild with debug:      aliBuild build {spec['package']} --debug\n"
+    buildErrMsg += f"  • Please upload the full log to CERNBox/Dropbox if you intend to request support.\n"
+
 
     dieOnError(err, buildErrMsg.strip())
 

{alibuild-1.17.35 → alibuild-1.17.36}/alibuild_helpers/build_template.sh

@@ -71,6 +71,16 @@ export BUILDROOT="$ALIBUILD_BUILD_WORK_DIR/BUILD/$PKGHASH"
 export SOURCEDIR="$WORK_DIR/SOURCES/$PKGNAME/$PKGVERSION/$COMMIT_HASH"
 export BUILDDIR="$BUILDROOT/$PKGNAME"
 
+# All caching for RECC should happen relative to $WORK_DIR
+export RECC_PROJECT_ROOT=$WORK_DIR
+export RECC_WORKING_DIR_PREFIX=$WORK_DIR
+# Moreover we allow caching stuff across different builds of the same
+# package, but not across packages.
+export RECC_PREFIX_MAP=$BUILDDIR=/recc/BUILDDIR-$PKGNAME:$INSTALLROOT=/recc/INSTALLROOT-$PKGNAME:$SOURCEDIR=/recc/SOURCEDIR-$PKGNAME
+#export RECC_PREFIX_MAP=$RECC_PREFIX_MAP:$(readlink $BUILDDIR)=/recc/BUILDDIR-$PKGNAME:$(readlink $INSTALLROOT)=/recc/INSTALLROOT-$PKGNAME:$(readlink $SOURCEDIR)=/recc/SOURCEDIR-$PKGNAME
+# No point in mixing packages
+export RECC_ACTION_SALT="$PKGNAME"
+
 rm -fr "$WORK_DIR/INSTALLROOT/$PKGHASH"
 # We remove the build directory only if we are not in incremental mode.
 if [[ "$INCREMENTAL_BUILD_HASH" == 0 ]] && ! rm -rf "$BUILDROOT"; then

{alibuild-1.17.35 → alibuild-1.17.36}/alibuild_helpers/clean.py

@@ -43,13 +43,13 @@ def decideClean(workDir, architecture, aggressiveCleanup):
   # we do not need the actual tarballs after they have been built.
   toDelete = ["%s/TMP" % workDir, "%s/INSTALLROOT" % workDir]
   if aggressiveCleanup:
-    toDelete += ["%s/TARS/%s/store" % (workDir, architecture),
+    toDelete += [f"{workDir}/TARS/{architecture}/store",
                  "%s/SOURCES" % (workDir)]
   allBuildStuff = glob.glob("%s/BUILD/*" % workDir)
   toDelete += [x for x in allBuildStuff
                if not path.islink(x) and basename(x) not in symlinksBuild]
-  installGlob ="%s/%s/*/" % (workDir, architecture)
-  installedPackages = set([dirname(x) for x in glob.glob(installGlob)])
+  installGlob =f"{workDir}/{architecture}/*/"
+  installedPackages = {dirname(x) for x in glob.glob(installGlob)}
   symlinksInstall = []
   for x in installedPackages:
     symlinksInstall += [path.realpath(y) for y in glob.glob(x + "/latest*")]

{alibuild-1.17.35 → alibuild-1.17.36}/alibuild_helpers/cmd.py

@@ -6,7 +6,7 @@ from textwrap import dedent
 from subprocess import TimeoutExpired
 from shlex import quote
 
-from alibuild_helpers.log import debug, warning, dieOnError
+from alibuild_helpers.log import debug, error, dieOnError
 
 def decode_with_fallback(data):
   """Try to decode DATA as utf-8; if that doesn't work, fall back to latin-1.
@@ -29,7 +29,7 @@ def getoutput(command, timeout=None):
   try:
     stdout, stderr = proc.communicate(timeout=timeout)
   except TimeoutExpired:
-    warning("Process %r timed out; terminated", command)
+    error("Process %r timed out; terminated", command)
     proc.terminate()
     stdout, stderr = proc.communicate()
   dieOnError(proc.returncode, "Command %s failed with code %d: %s" %
@@ -43,7 +43,7 @@ def getstatusoutput(command, timeout=None, cwd=None):
   try:
     merged_output, _ = proc.communicate(timeout=timeout)
   except TimeoutExpired:
-    warning("Process %r timed out; terminated", command)
+    error("Process %r timed out; terminated", command)
     proc.terminate()
     merged_output, _ = proc.communicate()
   merged_output = decode_with_fallback(merged_output)
@@ -88,14 +88,8 @@ class DockerRunner:
   def __enter__(self):
     if self._docker_image:
       # "sleep inf" pauses forever, until we kill it.
-      envOpts = []
-      volumes = []
-      for env in self._extra_env.items():
-        envOpts.append("-e")
-        envOpts.append(f"{env[0]}={env[1]}")
-      for v in self._extra_volumes:
-        volumes.append("-v")
-        volumes.append(v)
+      envOpts = [opt for k, v in self._extra_env.items() for opt in ("-e", f"{k}={v}")]
+      volumes = [opt for v in self._extra_volumes for opt in ("-v", v)]
       cmd = ["docker", "run", "--detach"] + envOpts + volumes + ["--rm", "--entrypoint="]
       cmd += self._docker_run_args
       cmd += [self._docker_image, "sleep", "inf"]
@@ -105,13 +99,13 @@ class DockerRunner:
       if self._container is None:
         command_prefix=""
         if self._extra_env:
-          command_prefix="env " + " ".join("{}={}".format(k, quote(v)) for (k,v) in self._extra_env.items()) + " "
-        return getstatusoutput("{}{} -c {}".format(command_prefix, BASH, quote(cmd))
+          command_prefix="env " + " ".join(f"{k}={quote(v)}" for (k,v) in self._extra_env.items()) + " "
+        return getstatusoutput(f"{command_prefix}{BASH} -c {quote(cmd)}"
                              , cwd=cwd)
       envOpts = []
       for env in self._extra_env.items():
         envOpts.append("-e")
-        envOpts.append("{}={}".format(env[0], env[1]))
+        envOpts.append(f"{env[0]}={env[1]}")
       exec_cmd = ["docker", "container", "exec"] + envOpts + [self._container, "bash", "-c", cmd]
       return getstatusoutput(exec_cmd, cwd=cwd)
 

{alibuild-1.17.35 → alibuild-1.17.36}/alibuild_helpers/deps.py

@@ -83,18 +83,18 @@ def doDeps(args, parser):
       assert color, "This should not happen (happened for %s)" % k
 
     # Node definition
-    dot += '"%s" [shape=box, style="rounded,filled", fontname="helvetica", fillcolor=%s]\n' % (k,color)
+    dot += f'"{k}" [shape=box, style="rounded,filled", fontname="helvetica", fillcolor={color}]\n'
 
     # Connections (different whether it's a build dependency or a runtime one)
     for dep in spec["build_requires"]:
-     dot += '"%s" -> "%s" [color=grey70]\n' % (k, dep)
+     dot += f'"{k}" -> "{dep}" [color=grey70]\n'
     for dep in spec["runtime_requires"]:
-     dot += '"%s" -> "%s" [color=dodgerblue3]\n' % (k, dep)
+     dot += f'"{k}" -> "{dep}" [color=dodgerblue3]\n'
 
   dot += "}\n"
 
   if args.outdot:
-    fp = open(args.outdot, "wt")
+    fp = open(args.outdot, "w")
   else:
     fp = NamedTemporaryFile(delete=False, mode="wt")
   fp.write(dot)

{alibuild-1.17.35 → alibuild-1.17.36}/alibuild_helpers/doctor.py

@@ -33,7 +33,7 @@ def checkPreferSystem(spec, cmd, homebrew_replacement, getstatusoutput_docker):
     warning("Package %s cannot be picked up from the system and will be built by aliBuild.\n"
             "This is due to the fact the following script fails:\n\n%s\n\n"
             "with the following output:\n\n%s\n",
-            spec["package"], cmd, "\n".join("%s: %s" % (spec["package"], x) for x in out.split("\n")))
+            spec["package"], cmd, "\n".join("{}: {}".format(spec["package"], x) for x in out.split("\n")))
     return (err, "")
 
 def checkRequirements(spec, cmd, homebrew_replacement, getstatusoutput_docker):
@@ -53,7 +53,7 @@ def checkRequirements(spec, cmd, homebrew_replacement, getstatusoutput_docker):
           "This is due to the fact that the following script fails:\n\n%s\n"
           "with the following output:\n\n%s\n%s\n",
           spec["package"], cmd,
-          "\n".join("%s: %s" % (spec["package"], x) for x in out.split("\n")),
+          "\n".join("{}: {}".format(spec["package"], x) for x in out.split("\n")),
           spec.get("system_requirement_missing"))
     return (err, "")
 
@@ -125,7 +125,7 @@ def doDoctor(args, parser):
   packages = []
   exitcode = 0
   for p in args.packages:
-    path = "%s/%s.sh" % (args.configDir, p.lower())
+    path = f"{args.configDir}/{p.lower()}.sh"
     if not exists(path):
       error("Cannot find recipe %s for package %s.", path, p)
       exitcode = 1
@@ -166,7 +166,7 @@ def doDoctor(args, parser):
                      taps                    = taps,
                      log                     = info)
 
-  alwaysBuilt = set(x for x in specs) - fromSystem - own - failed
+  alwaysBuilt = {x for x in specs} - fromSystem - own - failed
   if alwaysBuilt:
     banner("The following packages will be built by aliBuild because\n"
            " usage of a system version of it is not allowed or supported, by policy:\n\n- %s",