From b58e7f2dc89073a5d6b7b11241987b7b6b5451c6 Mon Sep 17 00:00:00 2001
From: Giulio Eulisse <10544+ktf@users.noreply.github.com>
Date: Tue, 14 May 2024 15:31:19 +0200
Subject: [PATCH 1/3] Check for valid c++ compiler in docker, if needed

---
 alibuild_helpers/doctor.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/alibuild_helpers/doctor.py b/alibuild_helpers/doctor.py
index 77f32521..46fd7da6 100644
--- a/alibuild_helpers/doctor.py
+++ b/alibuild_helpers/doctor.py
@@ -80,7 +80,8 @@ 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"

From 1eae787c6214087ba72ef3ae1bfbbe50bda3f78c Mon Sep 17 00:00:00 2001
From: Giulio Eulisse <10544+ktf@users.noreply.github.com>
Date: Tue, 14 May 2024 15:31:43 +0200
Subject: [PATCH 2/3] Migrate to Alma9 the message regarding prerequisites

---
 alibuild_helpers/doctor.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/alibuild_helpers/doctor.py b/alibuild_helpers/doctor.py
index 46fd7da6..f57d94d0 100644
--- a/alibuild_helpers/doctor.py
+++ b/alibuild_helpers/doctor.py
@@ -86,7 +86,7 @@ def doDoctor(args, parser):
     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",
@@ -96,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",

From 4c4c1f1871330005ae5d11511f8324338ad2051e Mon Sep 17 00:00:00 2001
From: Giulio Eulisse <10544+ktf@users.noreply.github.com>
Date: Wed, 20 Mar 2024 09:15:43 +0100
Subject: [PATCH 3/3] Allow cloning sapling repositories when sapling is used
 for devel pkg

---
 alibuild_helpers/sl.py | 3 +++
 1 file changed, 3 insertions(+)

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):