Fix the architecture in case of RHEL-based products

uyuni-project · Oct 16, 2023 · 65e10cb · 65e10cb
1 parent 73bd92f
commit 65e10cb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/java/code/src/com/suse/manager/reactor/messaging/RegistrationUtils.java b/java/code/src/com/suse/manager/reactor/messaging/RegistrationUtils.java
@@ -408,16 +408,17 @@ else if (Set.of("redhat", "centos", "oel", "alibaba cloud (aliyun)", "almalinux"
 
             Optional<RedhatProductInfo> redhatProductInfo = systemQuery.redhatProductInfo(minionId);
 
+            String productArch = arch.replace("-redhat-linux", "");
             Optional<RhelUtils.RhelProduct> rhelProduct =
-                    redhatProductInfo.flatMap(x -> RhelUtils.detectRhelProduct(
-                            channels, arch, x.getWhatProvidesRes(), x.getWhatProvidesSLL(),  x.getRhelReleaseContent(),
-                            x.getCentosReleaseContent(), x.getOracleReleaseContent(), x.getAlibabaReleaseContent(),
-                            x.getAlmaReleaseContent(), x.getAmazonReleaseContent(), x.getRockyReleaseContent()));
+                redhatProductInfo.flatMap(x -> RhelUtils.detectRhelProduct(
+                    channels, productArch, x.getWhatProvidesRes(), x.getWhatProvidesSLL(), x.getRhelReleaseContent(),
+                    x.getCentosReleaseContent(), x.getOracleReleaseContent(), x.getAlibabaReleaseContent(),
+                    x.getAlmaReleaseContent(), x.getAmazonReleaseContent(), x.getRockyReleaseContent()));
             return Opt.stream(rhelProduct).flatMap(rhel -> {
 
                 if (rhel.getSuseBaseProduct().isEmpty()) {
                     LOG.warn("No product match found for: {} {} {} {}", rhel.getName(), rhel.getVersion(),
-                            rhel.getRelease(), arch);
+                            rhel.getRelease(), productArch);
                     return Stream.empty();
                 }
                 return rhel.getAllSuseProducts().stream();

diff --git a/java/spacewalk-java.changes.mackdk.4.3-fix-product-detection-rhel b/java/spacewalk-java.changes.mackdk.4.3-fix-product-detection-rhel
@@ -0,0 +1 @@
+- Fixed detection in case RHEL-based products (bsc#1214280)