Merge pull request #542 from cpanel/RE-934

Ensure final dnf update is executed
cpanel · Nov 4, 2024 · 6c90667 · 6c90667
2 parents be0b30c + 37f910d
commit 6c90667
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 14 deletions.
diff --git a/elevate-cpanel b/elevate-cpanel
@@ -6717,8 +6717,8 @@ EOS
         return instance()->update_with_options( $options, $pkgs );
     }
 
-    sub update_allow_erasing (@args) {
-        return instance()->update_allow_erasing(@args);
+    sub update_allow_erasing (@additional_args) {
+        return instance()->update_allow_erasing(@additional_args);
     }
 
     sub makecache () {
@@ -6893,7 +6893,7 @@ EOS
         die "update_with_options unimplemented";
     }
 
-    sub update_allow_erasing ( $self, @args ) {
+    sub update_allow_erasing ( $self, @additional_args ) {
         die "update_allow_erasing unimplemented";
     }
 
@@ -7153,13 +7153,16 @@ EOS
         return;
     }
 
-    sub update_allow_erasing ( $self, @args ) {
+    sub update_allow_erasing ( $self, @additional_args ) {
         my $pkgmgr = $self->_pkgmgr();
 
-        my @additional_args = scalar @args ? @args : '';
-
-        $self->ssystem( $pkgmgr, '-y', '--allowerasing', @additional_args, 'update' );
+        my @args = (
+            '-y',
+            '--allowerasing',
+        );
 
+        push @args, @additional_args;
+        $self->ssystem_and_die( $pkgmgr, @args, 'update' );
         return;
     }
 

diff --git a/lib/Elevate/PkgMgr.pm b/lib/Elevate/PkgMgr.pm
@@ -125,8 +125,8 @@ sub update_with_options ( $options, $pkgs ) {
     return instance()->update_with_options( $options, $pkgs );
 }
 
-sub update_allow_erasing (@args) {
-    return instance()->update_allow_erasing(@args);
+sub update_allow_erasing (@additional_args) {
+    return instance()->update_allow_erasing(@additional_args);
 }
 
 sub makecache () {

diff --git a/lib/Elevate/PkgMgr/Base.pm b/lib/Elevate/PkgMgr/Base.pm
@@ -156,7 +156,7 @@ sub update_with_options ( $self, $options, $pkgs ) {
     die "update_with_options unimplemented";
 }
 
-sub update_allow_erasing ( $self, @args ) {
+sub update_allow_erasing ( $self, @additional_args ) {
     die "update_allow_erasing unimplemented";
 }
 

diff --git a/lib/Elevate/PkgMgr/YUM.pm b/lib/Elevate/PkgMgr/YUM.pm
@@ -254,13 +254,16 @@ sub update_with_options ( $self, $options, $pkgs ) {
     return;
 }
 
-sub update_allow_erasing ( $self, @args ) {
+sub update_allow_erasing ( $self, @additional_args ) {
     my $pkgmgr = $self->_pkgmgr();
 
-    my @additional_args = scalar @args ? @args : '';
-
-    $self->ssystem( $pkgmgr, '-y', '--allowerasing', @additional_args, 'update' );
+    my @args = (
+        '-y',
+        '--allowerasing',
+    );
 
+    push @args, @additional_args;
+    $self->ssystem_and_die( $pkgmgr, @args, 'update' );
     return;
 }