alibuild 1.17.22__tar.gz → 1.17.24__tar.gz

{alibuild-1.17.22/alibuild.egg-info → alibuild-1.17.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alibuild
-Version: 1.17.22
+Version: 1.17.24
 Summary: ALICE Build Tool
 Author-email: Giulio Eulisse <giulio.eulisse@cern.ch>, Timo Wilken <timo.wilken@cern.ch>, Sergio Garcia <sergio.garcia@cern.ch>
 Project-URL: homepage, https://alisw.github.io/alibuild

{alibuild-1.17.22 → alibuild-1.17.24/alibuild.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alibuild
-Version: 1.17.22
+Version: 1.17.24
 Summary: ALICE Build Tool
 Author-email: Giulio Eulisse <giulio.eulisse@cern.ch>, Timo Wilken <timo.wilken@cern.ch>, Sergio Garcia <sergio.garcia@cern.ch>
 Project-URL: homepage, https://alisw.github.io/alibuild

{alibuild-1.17.22 → alibuild-1.17.24}/alibuild_helpers/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.17.22'
-__version_tuple__ = version_tuple = (1, 17, 22)
+__version__ = version = '1.17.24'
+__version_tuple__ = version_tuple = (1, 17, 24)

{alibuild-1.17.22 → alibuild-1.17.24}/alibuild_helpers/build_template.sh

@@ -103,9 +103,9 @@ unset DYLD_LIBRARY_PATH
 EOF
 
 cd "$BUILDROOT"
-ln -snf $PKGHASH "${BUILDROOT}-latest"
+ln -snf "$PKGHASH" "$ALIBUILD_BUILD_WORK_DIR/BUILD/$PKGNAME-latest"
 if [[ $DEVEL_PREFIX ]]; then
-  ln -snf $PKGHASH "${BUILDROOT}-latest-$DEVEL_PREFIX"
+  ln -snf "$PKGHASH" "$ALIBUILD_BUILD_WORK_DIR/BUILD/$PKGNAME-latest-$DEVEL_PREFIX"
 fi
 
 cd "$BUILDDIR"

{alibuild-1.17.22 → alibuild-1.17.24}/alibuild_helpers/log.py

@@ -53,14 +53,21 @@ def log_current_package(package, main_package, specs, devel_prefix) -> None:
 
 
 class ProgressPrint:
-  def __init__(self, begin_msg="") -> None:
+  def __init__(self, begin_msg="", min_interval=0.) -> None:
     self.count = -1
     self.lasttime = 0
     self.STAGES = ".", "..", "...", "....", ".....", "....", "...", ".."
     self.begin_msg = begin_msg
     self.percent = -1
+    self.min_interval = min_interval
+    self.last_update = 0
 
   def __call__(self, txt, *args) -> None:
+    now = time.time()
+    if (now - self.last_update) < self.min_interval:
+      return
+    self.last_update = now
+
     if logger.level <= logging.DEBUG or not sys.stdout.isatty():
       debug(txt, *args)
       return

{alibuild-1.17.22 → alibuild-1.17.24}/alibuild_helpers/sync.py

@@ -8,6 +8,7 @@ import sys
 import time
 import requests
 from requests.exceptions import RequestException
+from urllib.parse import quote
 
 from alibuild_helpers.cmd import execute
 from alibuild_helpers.log import debug, info, error, dieOnError, ProgressPrint
@@ -178,7 +179,7 @@ class HttpRemoteSync:
       destPath = os.path.join(self.workdir, store_path, use_tarball)
       if not os.path.isfile(destPath):   # do not download twice
         progress = ProgressPrint("Downloading tarball for %s@%s" %
-                                 (spec["package"], spec["version"]))
+                                 (spec["package"], spec["version"]), min_interval=5.0)
         progress("[0%%] Starting download of %s", use_tarball)  # initialise progress bar
         self.getRetry("/".join((self.remoteStore, store_path, use_tarball)),
                       destPath, session=session, progress=progress)
@@ -225,7 +226,7 @@ class HttpRemoteSync:
         # This symlink isn't in the manifest yet, and we don't have it locally,
         # so download it individually.
         symlinks[linkname] = \
-            self.getRetry("/".join((self.remoteStore, links_path, linkname)),
+            self.getRetry("/".join((self.remoteStore, links_path, quote(linkname))),
                           returnResult=True, log=False, session=session) \
                 .decode("utf-8").rstrip("\r\n")
     for linkname, target in symlinks.items():
@@ -551,7 +552,7 @@ class Boto3RemoteSync:
       for tarball in self._s3_listdir(store_path):
         debug("Fetching tarball %s", tarball)
         progress = ProgressPrint("Downloading tarball for %s@%s" %
-                                 (spec["package"], spec["version"]))
+                                 (spec["package"], spec["version"]), min_interval=5.0)
         progress("[0%%] Starting download of %s", tarball)   # initialise progress bar
         # Create containing directory locally. (exist_ok= is python3-specific.)
         os.makedirs(os.path.join(self.workdir, store_path), exist_ok=True)
@@ -679,6 +680,7 @@ class Boto3RemoteSync:
 
     # Second, upload dist symlinks. These should be in place before the main
     # tarball, to avoid races in the publisher.
+    start_time = time.time()
     for link_dir, symlinks in dist_symlinks.items():
       for link_key, hash_path in symlinks:
         self.s3.put_object(Bucket=self.writeStore,
@@ -688,6 +690,10 @@ class Boto3RemoteSync:
                            WebsiteRedirectLocation=hash_path)
       debug("Uploaded %d dist symlinks to S3 from %s",
             len(symlinks), link_dir)
+    end_time = time.time()
+    debug("Uploaded %d dist symlinks in %.2f seconds",
+          sum(len(symlinks) for _, symlinks in dist_symlinks.items()),
+          end_time - start_time)
 
     self.s3.upload_file(Bucket=self.writeStore, Key=tar_path,
                         Filename=os.path.join(self.workdir, tar_path))