look for the PAYG CA certificate in different order to import the cor…

…rect one
uyuni-project · Oct 12, 2023 · fc4591b · fc4591b
1 parent 39ea7e8
commit fc4591b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/payg/script/payg_extract_repo_data.py b/java/code/src/com/redhat/rhn/taskomatic/task/payg/script/payg_extract_repo_data.py
@@ -115,9 +115,9 @@ def _extract_rmt_server_info(netloc):
         system_exit(4, ["unable to get ip for repository server (error {}):".format(e)])
 
     server_ip = host_ip_output.split(" ")[0].strip()
-    ca_cert_path = "/usr/share/pki/trust/anchors/registration_server_%s.pem" % server_ip.replace('.','_')
+    ca_cert_path = "/etc/pki/trust/anchors/registration_server_%s.pem" % server_ip.replace('.','_')
     if not Path(ca_cert_path).exists():
-        ca_cert_path = "/etc/pki/trust/anchors/registration_server_%s.pem" % server_ip.replace('.','_')
+        ca_cert_path = "/usr/share/pki/trust/anchors/registration_server_%s.pem" % server_ip.replace('.','_')
         if not Path(ca_cert_path).exists():
             system_exit(6, ["CA file for server {} not found (location '/etc/pki/trust/anchors/' or '/usr/share/pki/trust/anchors/')".format( server_ip)])
     with open(ca_cert_path) as f:

diff --git a/java/spacewalk-java.changes.mc.Manager-4.3-fix-payg-cert-import b/java/spacewalk-java.changes.mc.Manager-4.3-fix-payg-cert-import
@@ -0,0 +1,2 @@
+- look for the PAYG CA certificate location in different order to
+  find and import the correct one (bsc#1214759)