Merge pull request #354 from cPholloway/RE-93

Do not return from EA4 blocker check prematurely
cpanel · Jan 19, 2024 · 7df9ff0 · 7df9ff0
2 parents 49a9f06 + 5ff77aa
commit 7df9ff0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/changelog b/changelog
@@ -1,6 +1,7 @@
 2024-??-?? - version 20
 - #338 - Improve warning and add prompt before starting the upgrade process
 - #327 - Block with cPanel accounts have databases on postgresql.
+- RE-93 - Do not return from EA4 blocker check prematurely
 
 2024-01-16 - version 19
 - #337 - Add blocker if cPanel is not running version 110

diff --git a/elevate-cpanel b/elevate-cpanel
@@ -890,7 +890,7 @@ EOS
 
         INFO("Checking EasyApache profile compatibility with $pretty_distro_name.");
 
-        return unless $self->cpev->component('EA4')->backup;          # _backup_ea4_profile();
+        $self->cpev->component('EA4')->backup;                        # _backup_ea4_profile();
         my $stash        = cpev::read_stage_file();                   # FIXME - move it to a function
         my $dropped_pkgs = $stash->{'ea4'}->{'dropped_pkgs'} // {};
         return unless scalar keys $dropped_pkgs->%*;

diff --git a/lib/Elevate/Blockers/EA4.pm b/lib/Elevate/Blockers/EA4.pm
@@ -38,7 +38,7 @@ sub _blocker_ea4_profile ($self) {
 
     INFO("Checking EasyApache profile compatibility with $pretty_distro_name.");
 
-    return unless $self->cpev->component('EA4')->backup;          # _backup_ea4_profile();
+    $self->cpev->component('EA4')->backup;                        # _backup_ea4_profile();
     my $stash        = cpev::read_stage_file();                   # FIXME - move it to a function
     my $dropped_pkgs = $stash->{'ea4'}->{'dropped_pkgs'} // {};
     return unless scalar keys $dropped_pkgs->%*;

diff --git a/t/blocker-ea4.t b/t/blocker-ea4.t
@@ -31,7 +31,7 @@ my $mock_cpev          = Test::MockModule->new('cpev');
     my $mock_isea4 = Test::MockFile->file( '/etc/cpanel/ea4/is_ea4' => 1 );
     my $type       = '';
 
-    $mock_compoment_ea4->redefine( backup => 1 );
+    $mock_compoment_ea4->redefine( backup => sub { return; } );
     my $mock_cpev = Test::MockModule->new('cpev');
     $mock_cpev->redefine(
         _read_stage_file => sub {
@@ -65,7 +65,7 @@ my $mock_cpev          = Test::MockModule->new('cpev');
 }
 
 {
-    $mock_compoment_ea4->redefine( backup => 1 );
+    $mock_compoment_ea4->redefine( backup => sub { return; } );
 
     my $ea_info_check = sub {
         message_seen( 'INFO' => "Checking EasyApache profile compatibility with AlmaLinux 8." );