diff --git a/alibuild_helpers/doctor.py b/alibuild_helpers/doctor.py index 77f32521..f57d94d0 100644 --- a/alibuild_helpers/doctor.py +++ b/alibuild_helpers/doctor.py @@ -80,12 +80,13 @@ def doDoctor(args, parser): # Decide if we can use homebrew. If not, we replace it with "true" so # that we do not get spurious messages on linux homebrew_replacement = "" - err, output = getstatusoutput("type c++") + with DockerRunner(args.dockerImage, args.docker_extra_args) as getstatusoutput_docker: + err, output = getstatusoutput_docker("type c++") if err: warning("Unable to find system compiler.\n" "%s\n" "Please follow prerequisites:\n" - "* On Centos compatible systems: https://alice-doc.github.io/alice-analysis-tutorial/building/prereq-centos7.html\n" + "* On RHEL9 compatible systems (e.g. Alma9): https://alice-doc.github.io/alice-analysis-tutorial/building/prereq-alma9.html\n" "* On Fedora compatible systems: https://alice-doc.github.io/alice-analysis-tutorial/building/prereq-fedora.html\n" "* On Ubuntu compatible systems: https://alice-doc.github.io/alice-analysis-tutorial/building/prereq-ubuntu.html\n" "* On macOS: https://alice-doc.github.io/alice-analysis-tutorial/building/prereq-macos.html\n", @@ -95,7 +96,7 @@ def doDoctor(args, parser): error("Unable to find git.\n" "%s\n" "Please follow prerequisites:\n" - "* On Centos compatible systems: https://alice-doc.github.io/alice-analysis-tutorial/building/prereq-centos7.html\n" + "* On RHEL9 compatible systems (e.g. Alma9): https://alice-doc.github.io/alice-analysis-tutorial/building/prereq-alma9.html\n" "* On Fedora compatible systems: https://alice-doc.github.io/alice-analysis-tutorial/building/prereq-fedora.html\n" "* On Ubuntu compatible systems: https://alice-doc.github.io/alice-analysis-tutorial/building/prereq-ubuntu.html\n" "* On macOS: https://alice-doc.github.io/alice-analysis-tutorial/building/prereq-macos.html\n", diff --git a/alibuild_helpers/sl.py b/alibuild_helpers/sl.py index ea858d6c..53ed41cd 100644 --- a/alibuild_helpers/sl.py +++ b/alibuild_helpers/sl.py @@ -41,6 +41,9 @@ def diffCmd(self, directory): def checkUntracked(self, line): return line.startswith("? ") + def cloneCmd(self, source, referenceRepo, usePartialClone): + cmd = ["clone", source, referenceRepo] + return cmd def sapling(args, directory=".", check=True, prompt=True):