alibuild 1.17.29__py3-none-any.whl → 1.17.30__py3-none-any.whl

{alibuild-1.17.29.dist-info → alibuild-1.17.30.dist-info}/METADATA

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

{alibuild-1.17.29.dist-info → alibuild-1.17.30.dist-info}/RECORD

@@ -1,24 +1,24 @@
-alibuild-1.17.29.data/scripts/aliBuild,sha256=5g-apCjhc9cvtFvKSP0yr6IJtChNvtTAP-BtPL-91M8,4307
-alibuild-1.17.29.data/scripts/aliDeps,sha256=fhfPB2NpuLj8bZZPUjJW2e4VxA8ZkHlp5q76xAOzufI,219
-alibuild-1.17.29.data/scripts/aliDoctor,sha256=gQwLcNGAm7_QF7FFCtmtFXEoroKsRonNMA7UP4DS1y4,221
-alibuild-1.17.29.data/scripts/alienv,sha256=8QihJOzKue4oeuIM31MsoX8Fw7FNZ4zY7wyK6UYtgTE,12568
-alibuild-1.17.29.data/scripts/pb,sha256=LfkIUyX3xXxmaGSdtAbA-dS1Y1eEShEHpmto1tIEga0,211
-alibuild-1.17.29.dist-info/licenses/LICENSE.md,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
+alibuild-1.17.30.data/scripts/aliBuild,sha256=5g-apCjhc9cvtFvKSP0yr6IJtChNvtTAP-BtPL-91M8,4307
+alibuild-1.17.30.data/scripts/aliDeps,sha256=fhfPB2NpuLj8bZZPUjJW2e4VxA8ZkHlp5q76xAOzufI,219
+alibuild-1.17.30.data/scripts/aliDoctor,sha256=gQwLcNGAm7_QF7FFCtmtFXEoroKsRonNMA7UP4DS1y4,221
+alibuild-1.17.30.data/scripts/alienv,sha256=8QihJOzKue4oeuIM31MsoX8Fw7FNZ4zY7wyK6UYtgTE,12568
+alibuild-1.17.30.data/scripts/pb,sha256=LfkIUyX3xXxmaGSdtAbA-dS1Y1eEShEHpmto1tIEga0,211
+alibuild-1.17.30.dist-info/licenses/LICENSE.md,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
 alibuild_helpers/__init__.py,sha256=ZAhyhRxOkiTA1fMzwEKACY8Eo8MdWp1MawVicFlvQWk,736
-alibuild_helpers/_version.py,sha256=NlTyhtdeLFxy9mDSGB683NzFpPHGHl5Qs1LtrwVU56M,708
+alibuild_helpers/_version.py,sha256=S3vMhcmKeZ1M1EPdc0HIDsBTTmXeeExv2qQ2rEwIH-E,708
 alibuild_helpers/analytics.py,sha256=fuiOagDngFnodGo7upMWeY-RjTTncDRz5Kwz8zxUr9o,4579
 alibuild_helpers/args.py,sha256=T0nOOMCpJZdJkEPZENz7nOsaYIfeZ7qHfAR1Vx4-T2Y,31694
-alibuild_helpers/build.py,sha256=FLeSwo-q_o6bPARbgKm1-pnwax1xe5ulc42bjSKqrog,56994
+alibuild_helpers/build.py,sha256=VJj0KwRkbPs5gCj-Ey2MWhl2NTLZWql6DGwp8AO3tTA,57055
 alibuild_helpers/build_template.sh,sha256=e7nh8ZhNH-z0LPkuETYVYlgM75EfhoCo__hn1QCIDak,13566
 alibuild_helpers/clean.py,sha256=-LeQUYDwxihzGJi4rCiuALu051T44-0cV8S6-l_lCaQ,3250
 alibuild_helpers/cmd.py,sha256=5tdxtyrHDzmdSVIA0pzxBoici1GZDS0fUStbX85r6ao,5906
 alibuild_helpers/deps.py,sha256=nHLyNqVuTUfW5bqfzCDxAaVVsklv5wHMl4FMMfTQF-8,4909
 alibuild_helpers/doctor.py,sha256=CSvfwmD28NRmvSnmZRTHWaf11pAoSIlMxJ1yW00Xh9c,9685
 alibuild_helpers/git.py,sha256=20JDRZX0wbJdsK__AI_nnS2rQmgElrMMD-OT6TDHCUU,4015
-alibuild_helpers/init.py,sha256=GmVLXqMS-aXqPnCk5dgAONMQFe7MqjlEtXtcQ1a-0qY,5009
+alibuild_helpers/init.py,sha256=x7OAErHzn34ceNqg-0GuHudYigh18Mk-P3RhN2P5mEI,5088
 alibuild_helpers/log.py,sha256=OEflXNcGNgvVYLZbvVwd2Inyt12tnEw5RgkrsiAT2c0,4700
 alibuild_helpers/scm.py,sha256=pZfEnTgr_ILmtRT3BXeoYVJGq9rjigLXOLAGJMsnDko,1019
-alibuild_helpers/sl.py,sha256=EdHs5Se6xpR9rhmhSJd_6f3Rfkxc8jl-97ZT1lG2T28,2356
+alibuild_helpers/sl.py,sha256=Aw3-Lvq3bQ2s_KTw6PXgqcjSoY-s8_0A55GRPKks4x0,2915
 alibuild_helpers/sync.py,sha256=I7RTb0nzCiWN-n4o8ZWXuCwObcKN6laWPkb7A2H1XVY,31375
 alibuild_helpers/templating_plugin.py,sha256=TWHdMQtDfX6Vqp5w9Huyh4ZEgLv5vYxAtPtX68xTOlk,662
 alibuild_helpers/utilities.py,sha256=nb0UC0qn2_rIJ-5GDnx-GoRAbF8tn1ELjZS-prUz9eo,26131
@@ -68,7 +68,7 @@ tests/testdist/clobber-initdotsh.sh,sha256=K4L8hiEgNg0hI2WAiEA65rWU5sp-fwOYkubpV
 tests/testdist/defaults-o2.sh,sha256=IJWVMYjQYz876twos1bj-5VnPv7WTdM0X-fd09j4xxM,325
 tests/testdist/delete-etc.sh,sha256=NFMApyWMLQu3HJMsx0x8ZEveCaXbosO6XzJk8KDRJdg,63
 tests/testdist/tracking-env.sh,sha256=3cJszuzJ5dxNYvHO4ydUOWIXwmMS7wfeb-JBCDK21O4,119
-alibuild-1.17.29.dist-info/METADATA,sha256=q1tYOUZrKM49Qsr-Q5JdGo3YNrwNuWMOfXxeaxumG4Q,2231
-alibuild-1.17.29.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-alibuild-1.17.29.dist-info/top_level.txt,sha256=WjKmc89Vn0WlbEp9a9VmhwqRkeKxjUX_6NT3T8K3Hv0,45
-alibuild-1.17.29.dist-info/RECORD,,
+alibuild-1.17.30.dist-info/METADATA,sha256=5cbv4OAQNWwaOcbtyYPlsh8eqqiWCYZJvc1E0WgjSuI,2231
+alibuild-1.17.30.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+alibuild-1.17.30.dist-info/top_level.txt,sha256=WjKmc89Vn0WlbEp9a9VmhwqRkeKxjUX_6NT3T8K3Hv0,45
+alibuild-1.17.30.dist-info/RECORD,,

alibuild_helpers/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.17.29'
-__version_tuple__ = version_tuple = (1, 17, 29)
+__version__ = version = '1.17.30'
+__version_tuple__ = version_tuple = (1, 17, 30)
 
 __commit_id__ = commit_id = None

alibuild_helpers/build.py

@@ -58,7 +58,7 @@ def update_git_repos(args, specs, buildOrder):
         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")):
+            if exists(os.path.join(specs[package]["source"], ".sl")) or exists(os.path.join(specs[package]["source"], ".git/sl")):
                 specs[package]["scm"] = Sapling()
         updateReferenceRepoSpec(args.referenceSources, package, specs[package],
                                 fetch=args.fetchRepos, allowGitPrompt=git_prompt)

alibuild_helpers/init.py

@@ -3,6 +3,7 @@ from alibuild_helpers.utilities import getPackageList, parseDefaults, readDefaul
 from alibuild_helpers.log import debug, error, warning, banner, info
 from alibuild_helpers.log import dieOnError
 from alibuild_helpers.workarea import updateReferenceRepoSpec
+from alibuild_helpers.cmd import getstatusoutput
 
 from os.path import join
 import os.path as path
@@ -54,7 +55,7 @@ def doInit(args):
                                          architecture="",
                                          disable=[],
                                          defaults=args.defaults,
-                                         performPreferCheck=lambda *x, **y: (1, ""),
+                                         performPreferCheck=lambda pkg, cmd: getstatusoutput(["bash", "-c", cmd]),
                                          performRequirementCheck=lambda *x, **y: (0, ""),
                                          performValidateDefaults=lambda spec : validateDefaults(spec, args.defaults),
                                          overrides=overrides,

alibuild_helpers/sl.py

@@ -20,9 +20,22 @@ class Sapling(SCM):
     return sapling(("whereami", ), directory)
 
   def branchOrRef(self, directory):
-    # Format is <hash>[+] <branch>
-    identity = sapling(("identify", ), directory)
-    return identity.split(" ")[-1]
+    # Format is * branch     ref or nothing
+    err, output = getstatusoutput("""\
+    set -e +x
+    sl -R {directory} bookmark -r . 2>/dev/null | grep -- "*"
+    """.format(
+        directory=quote(directory),
+    ), timeout=SL_COMMAND_TIMEOUT_SEC)
+    if err > 1:
+        raise SCMError("Error {} from sl bookmark -r . : {}".format(err, output))
+    # We use "none" to indicate there are no bookmarks. This means
+    # that a devel package will act as a single branch, regardless of where we are.
+    if not output.strip():
+      return "none"
+    # If a bookmark is there, we use it to determine that we should rebuild
+    # when we move to it
+    return output.split(" ")[2]
 
   def exec(self, *args, **kwargs):
     return sapling(*args, **kwargs)