Fix package profile update on CentOS 7 when yum-utils is not installed

uyuni-project · Jun 28, 2024 · 3def854 · 3def854
1 parent 0633dc9
commit 3def854
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/java/code/src/com/suse/manager/utils/SaltUtils.java b/java/code/src/com/suse/manager/utils/SaltUtils.java
@@ -1536,8 +1536,10 @@ else if ("debian".equalsIgnoreCase(grains.getValueAsString("os"))) {
                 .orElse(null));
 
         result.getRebootRequired()
-                .map(flag -> (Boolean) flag.getChanges().getRet().get("reboot_required"))
-                .ifPresent(flag -> server.setRebootRequiredAfter(flag ? new Date() : null));
+            .map(rr -> rr.getChanges().getRet())
+            .filter(Objects::nonNull)
+            .map(ret -> (Boolean) ret.get("reboot_required"))
+            .ifPresent(flag -> server.setRebootRequiredAfter(flag ? new Date() : null));
 
         // Update live patching version
         server.setKernelLiveVersion(result.getKernelLiveVersionInfo()

diff --git a/java/spacewalk-java.changes.welder.fix-centos7-pkg-profile-update b/java/spacewalk-java.changes.welder.fix-centos7-pkg-profile-update
@@ -0,0 +1 @@
+- Fix package profile update on CentOS 7 when yum-utils is not installed (bsc#1227133)
diff --git a/susemanager-utils/susemanager-sls/salt/packages/profileupdate.sls b/susemanager-utils/susemanager-sls/salt/packages/profileupdate.sls
@@ -53,6 +53,10 @@ status_uptime:
 reboot_required:
   mgrcompat.module_run:
     - name: reboot_info.reboot_required
+    {%- if grains['os_family'] == 'RedHat' and grains['osmajorrelease'] < 8 %}
+    - onlyif:
+      - which needs-restarting
+    {%- endif %}
 {%- endif %}
 
 kernel_live_version:

diff --git a/...nager-utils/susemanager-sls/susemanager-sls.changes.welder.fix-centos7-pkg-profile-update b/...nager-utils/susemanager-sls/susemanager-sls.changes.welder.fix-centos7-pkg-profile-update
@@ -0,0 +1 @@
+- Fix package profile update on CentOS 7 when yum-utils is not installed (bsc#1227133)