Fix leapp upgrade process to not remove jetbackup5-cpanel

Was dependant on libzip.so.2 which isn't available in 8.
cpanel · Jan 24, 2024 · 3389bb2 · 3389bb2
1 parent b5f59e6
commit 3389bb2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/elevate-cpanel b/elevate-cpanel
@@ -2936,6 +2936,8 @@ EOS
 
         cpev::update_stage_file( { 'reinstall' => { 'jetbackup' => $data } } );
 
+        $self->ssystem(qw{/usr/bin/rpm -e --nodeps jetphp81-zip});
+
         return;
     }
 
@@ -2948,7 +2950,9 @@ EOS
 
         my $tier     = $data->{tier};
         my @packages = $data->{packages}->@*;
-        $self->ssystem( qw{/usr/bin/yum -y update --enablerepo=jetapps}, "--enablerepo=$tier", @packages );
+
+        $self->ssystem( qw{/usr/bin/yum -y install --enablerepo=jetapps}, "--enablerepo=$tier", 'jetphp81-zip' );
+        $self->ssystem( qw{/usr/bin/yum -y update --enablerepo=jetapps},  "--enablerepo=$tier", @packages );
 
         return;
     }

diff --git a/lib/Elevate/Components/JetBackup.pm b/lib/Elevate/Components/JetBackup.pm
@@ -43,6 +43,9 @@ sub pre_leapp ($self) {
 
     cpev::update_stage_file( { 'reinstall' => { 'jetbackup' => $data } } );
 
+    # Remove this package because leapp will remove it as it depends on libzip.so.2 which isn't available in 8.
+    $self->ssystem(qw{/usr/bin/rpm -e --nodeps jetphp81-zip});
+
     return;
 }
 
@@ -55,7 +58,9 @@ sub post_leapp ($self) {
 
     my $tier     = $data->{tier};
     my @packages = $data->{packages}->@*;
-    $self->ssystem( qw{/usr/bin/yum -y update --enablerepo=jetapps}, "--enablerepo=$tier", @packages );
+
+    $self->ssystem( qw{/usr/bin/yum -y install --enablerepo=jetapps}, "--enablerepo=$tier", 'jetphp81-zip' );
+    $self->ssystem( qw{/usr/bin/yum -y update --enablerepo=jetapps},  "--enablerepo=$tier", @packages );
 
     return;
 }