Merge pull request #72 from larsewi/suse

Fixed cf-remote install package for SUSE 12-SP5
cfengine · Jan 5, 2024 · 8090dc5 · 8090dc5
2 parents 662e5d2 + 148c1f9
commit 8090dc5
Showing 1 changed file with 33 additions and 6 deletions.
diff --git a/cf_remote/remote.py b/cf_remote/remote.py
@@ -130,15 +130,32 @@ def get_package_tags(os_release=None, redhat_release=None):
 
         # Add tags with version number first, to filter by them first:
         tags.append(platform_tag)  # Example: ubuntu16
-        if distro == "centos" or distro == "rhel" or distro == "ol" or distro == "rocky" or distro == "almalinux":
+        if (
+            distro == "centos"
+            or distro == "rhel"
+            or distro == "ol"
+            or distro == "rocky"
+            or distro == "almalinux"
+        ):
             tags.append("el" + major)
 
         # Then add more generic tags (lower priority):
         tags.append(distro)  # Example: ubuntu
-        if distro == "centos" or distro == "ol" or distro == "rocky" or distro == "almalinux":
+        if (
+            distro == "centos"
+            or distro == "ol"
+            or distro == "rocky"
+            or distro == "almalinux"
+        ):
             tags.append("rhel")
 
-        if distro == "centos" or distro == "rhel" or distro == "ol" or distro == "rocky" or distro == "almalinux":
+        if (
+            distro == "centos"
+            or distro == "rhel"
+            or distro == "ol"
+            or distro == "rocky"
+            or distro == "almalinux"
+        ):
             tags.append("el")
     elif redhat_release is not None:
         # Examples:
@@ -234,10 +251,20 @@ def install_package(host, pkg, data, *, connection=None):
         # generally this "else" is for rpm packages
         if "yum" in data["bin"]:
             output = ssh_sudo(connection, "yum -y install {}".format(pkg), True)
-        elif "zypper" in data["bin"]: # suse case
-            output = ssh_sudo(connection, "zypper install -y --allow-unsigned-rpm {}".format(pkg), True)
+        elif "zypper" in data["bin"]:  # suse case
+            allow_unsigned = (
+                ""
+                if data["os_release"]["VERSION"]
+                == "12-SP5"  # Does not support the option
+                else "--allow-unsigned-rpm"
+            )
+            output = ssh_sudo(
+                connection, "zypper install -y {} {}".format(allow_unsigned, pkg), True
+            )
         else:
-            log.error("Don't know how to install rpm package. No yum or zypper in PATH.")
+            log.error(
+                "Don't know how to install rpm package. No yum or zypper in PATH."
+            )
     if output is None:
         log.error("Installation failed on '{}'".format(host))