From 27e5267d84ef773f0b40af5ff7db5e3943166beb Mon Sep 17 00:00:00 2001 From: Thomas Florio Date: Thu, 17 Aug 2023 14:00:58 +0200 Subject: [PATCH] Fix the architecture in case of RHEL-based products --- .../manager/reactor/messaging/RegistrationUtils.java | 11 ++++++----- ...java.changes.mackdk.4.3-fix-product-detection-rhel | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 java/spacewalk-java.changes.mackdk.4.3-fix-product-detection-rhel diff --git a/java/code/src/com/suse/manager/reactor/messaging/RegistrationUtils.java b/java/code/src/com/suse/manager/reactor/messaging/RegistrationUtils.java index 14850f753c9e..c8d8631d0c98 100644 --- a/java/code/src/com/suse/manager/reactor/messaging/RegistrationUtils.java +++ b/java/code/src/com/suse/manager/reactor/messaging/RegistrationUtils.java @@ -413,16 +413,17 @@ else if (Set.of("redhat", "centos", "oel", "alibaba cloud (aliyun)", "almalinux" Optional redhatProductInfo = systemQuery.redhatProductInfo(minionId); + String productArch = arch.replace("-redhat-linux", ""); Optional 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 new file mode 100644 index 000000000000..faec1172817f --- /dev/null +++ b/java/spacewalk-java.changes.mackdk.4.3-fix-product-detection-rhel @@ -0,0 +1 @@ +- Fixed detection in case RHEL-based products (bsc#1214280)