Allow to specify selected packages to --no-system (#914)

This allows to test a recipe which has a valid prefer_system_check
without uninstalling the given system package.

Author: ktf

alibuild_helpers/args.py

@@ -176,8 +176,8 @@ def doParseArgs():
   build_system = build_parser.add_mutually_exclusive_group()
   build_system.add_argument("--always-prefer-system", dest="preferSystem", action="store_true",
                             help="Always use system packages when compatible.")
-  build_system.add_argument("--no-system", dest="noSystem", action="store_true",
-                            help="Never use system packages, even if compatible.")
+  build_system.add_argument("--no-system", dest="noSystem", nargs="?", const="*", default=None, metavar="PACKAGES",
+                            help="Never use system packages for the provided, command separated, PACKAGES, even if compatible.")
 
   # Options for clean subcommand
   clean_parser.add_argument("-a", "--architecture", dest="architecture", metavar="ARCH", default=detectedArch,
@@ -237,8 +237,8 @@ def doParseArgs():
   deps_system = deps_parser.add_mutually_exclusive_group()
   deps_system.add_argument("--always-prefer-system", dest="preferSystem", action="store_true",
                            help="Always use system packages when compatible.")
-  deps_system.add_argument("--no-system", dest="noSystem", action="store_true",
-                           help="Never use system packages, even if compatible.")
+  deps_system.add_argument("--no-system", dest="noSystem", nargs="?", const="*", default=None, metavar="PACKAGES",
+                           help="Never use system packages for PACKAGES, even if compatible.")
 
   # Options for the doctor subcommand
   doctor_parser.add_argument("packages", metavar="PACKAGE", nargs="+",
@@ -258,8 +258,8 @@ def doParseArgs():
   doctor_system = doctor_parser.add_mutually_exclusive_group()
   doctor_system.add_argument("--always-prefer-system", dest="preferSystem", action="store_true",
                              help="Always use system packages when compatible.")
-  doctor_system.add_argument("--no-system", dest="noSystem", action="store_true",
-                             help="Never use system packages, even if compatible.")
+  doctor_system.add_argument("--no-system", dest="noSystem", nargs="?", const="*", default=None, metavar="PACKAGES",
+                             help="Never use system packages for the provided, command separated, PACKAGES, even if compatible.")
 
   doctor_docker = doctor_parser.add_argument_group(title="Use a Docker container", description="""\
   If you're planning to build inside a Docker container, e.g. using aliBuild
@@ -457,14 +457,14 @@ def finaliseArgs(args, parser):
 
     # On selected platforms, caching is active by default
     if args.architecture in S3_SUPPORTED_ARCHS and not args.preferSystem and not args.no_remote_store:
-      args.noSystem = True
+      args.noSystem = "*"
       if not args.remoteStore:
         args.remoteStore = "https://s3.cern.ch/swift/v1/alibuild-repo"
     elif args.no_remote_store:
       args.remoteStore = ""
 
     if args.remoteStore or args.writeStore:
-      args.noSystem = True
+      args.noSystem = "*"
 
     if args.remoteStore.endswith("::rw") and args.writeStore:
       parser.error("cannot specify ::rw and --write-store at the same time")

alibuild_helpers/init.py

@@ -50,7 +50,7 @@ def doInit(args):
                                          specs=specs,
                                          configDir=args.configDir,
                                          preferSystem=False,
-                                         noSystem=True,
+                                         noSystem="*",
                                          architecture="",
                                          disable=[],
                                          defaults=args.defaults,

alibuild_helpers/utilities.py

@@ -498,7 +498,14 @@ def getPackageList(packages, specs, configDir, preferSystem, noSystem,
       systemREMatches = re.match(systemRE, architecture)
     except TypeError:
       dieOnError(True, "Malformed entry prefer_system: %s in %s" % (systemRE, spec["package"]))
-    if not noSystem and (preferSystem or systemREMatches):
+
+    noSystemList = []
+    if noSystem == "*":
+      noSystemList = [spec["package"]]
+    elif noSystem is not None:
+      noSystemList = noSystem.split(",")
+
+    if (spec["package"] not in noSystemList) and (preferSystem or systemREMatches):
       requested_version = resolve_version(spec, defaults, "unavailable", "unavailable")
       cmd = "REQUESTED_VERSION={version}\n{check}".format(
         version=quote(requested_version),

tests/test_args.py

@@ -48,11 +48,11 @@ class FakeExit(Exception):
   ((), "build --force-unknown-architecture -j 10 zlib --disable gcc --disable foo,bar" , [("disable", ["gcc", "foo", "bar"])]),
   ((), "init zlib --dist master"                                                       , [("dist", {"repo": "alisw/alidist", "ver": "master"})]),
   ((), "init zlib --dist ktf/alidist@dev"                                              , [("dist", {"repo": "ktf/alidist", "ver": "dev"})]),
-  ((), "build --force-unknown-architecture zlib --remote-store rsync://test.local/"    , [("noSystem", True), ("remoteStore", "rsync://test.local/")]),
-  ((), "build --force-unknown-architecture zlib --remote-store rsync://test.local/::rw", [("noSystem", True), ("remoteStore", "rsync://test.local/"), ("writeStore", "rsync://test.local/")]),
-  ((), "build --force-unknown-architecture zlib --no-remote-store --remote-store rsync://test.local/", [("noSystem", False), ("remoteStore", "")]),
-  ((), "build zlib --architecture slc7_x86-64"                                         , [("noSystem", True), ("preferSystem", False), ("remoteStore", "https://s3.cern.ch/swift/v1/alibuild-repo")]),
-  ((), "build zlib --architecture ubuntu1804_x86-64"                                   , [("noSystem", False), ("preferSystem", False), ("remoteStore", "")]),
+  ((), "build --force-unknown-architecture zlib --remote-store rsync://test.local/"    , [("noSystem", "*"), ("remoteStore", "rsync://test.local/")]),
+  ((), "build --force-unknown-architecture zlib --remote-store rsync://test.local/::rw", [("noSystem", "*"), ("remoteStore", "rsync://test.local/"), ("writeStore", "rsync://test.local/")]),
+  ((), "build --force-unknown-architecture zlib --no-remote-store --remote-store rsync://test.local/", [("noSystem", None), ("remoteStore", "")]),
+  ((), "build zlib --architecture slc7_x86-64"                                         , [("noSystem", "*"), ("preferSystem", False), ("remoteStore", "https://s3.cern.ch/swift/v1/alibuild-repo")]),
+  ((), "build zlib --architecture ubuntu1804_x86-64"                                   , [("noSystem", None), ("preferSystem", False), ("remoteStore", "")]),
   ((), "build zlib -a slc7_x86-64"                                                     , [("docker", False), ("dockerImage", None), ("docker_extra_args", ["--network=host"])]),
   ((), "build zlib -a slc7_x86-64 --docker-image registry.cern.ch/alisw/some-builder"  , [("docker", True), ("dockerImage", "registry.cern.ch/alisw/some-builder")]),
   ((), "build zlib -a slc7_x86-64 --docker"                                            , [("docker", True), ("dockerImage", "registry.cern.ch/alisw/slc7-builder")]),

tests/test_build.py

@@ -268,7 +268,7 @@ def test_coverDoBuild(self, mock_debug, mock_listdir, mock_warning, mock_git_git
             jobs=2,
             annotate={},
             preferSystem=[],
-            noSystem=False,
+            noSystem=None,
             debug=True,
             dryRun=False,
             aggressiveCleanup=False,

tests/test_deps.py

@@ -57,7 +57,7 @@ def depsOpen(fn, mode):
                          dockerImage=None,
                          docker_extra_args=["--network=host"],
                          preferSystem=[],
-                         noSystem=True,
+                         noSystem="*",
                          architecture="slc7_x86-64",
                          disable=[],
                          neat=True,

tests/test_doctor.py

@@ -80,7 +80,7 @@ def resetOut():
                      docker_extra_args=["--network=host"],
                      debug=False,
                      preferSystem=[],
-                     noSystem=False,
+                     noSystem="*",
                      architecture="osx_x86-64",
                      disable=[],
                      defaults="release")

tests/test_packagelist.py

@@ -89,10 +89,10 @@ def getPackageListWithDefaults(packages, force_rebuild=()):
         specs=specs,
         configDir="CONFIG_DIR",
         # Make sure getPackageList considers prefer_system_check.
-        # (Even with preferSystem=False + noSystem=False, it is sufficient
+        # (Even with preferSystem=False + noSystem=None, it is sufficient
         # if the prefer_system regex matches the architecture.)
         preferSystem=True,
-        noSystem=False,
+        noSystem=None,
         architecture="ARCH",
         disable=[],
         defaults="release",