Merge pull request #358 from cpanel/re94

Break X::Tiny not perl to force fix-cpanel-perl to run
cpanel · Jan 23, 2024 · f20c08b · f20c08b
2 parents 658a3c9 + ea925a8
commit f20c08b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/elevate-cpanel b/elevate-cpanel
@@ -5853,7 +5853,8 @@ sub run_stage_4 ($self) {
             $self->ssystem(qw{/usr/bin/dnf config-manager --enable powertools});
             $self->ssystem(qw{/usr/bin/dnf config-manager --enable epel});
 
-            $self->ssystem(qw{/usr/bin/rm -f /usr/local/cpanel/3rdparty/bin/perl});
+            # Break cpanel-perl (NOTE: This only works on perl 5.36)
+            $self->ssystem(qw{/usr/bin/rm -f /usr/local/cpanel/3rdparty/perl/536/cpanel-lib/X/Tiny.pm});
             {
                 local $ENV{'CPANEL_BASE_INSTALL'} = 1;    # Don't fix more than perl itself.
                 $self->ssystem(qw{/usr/local/cpanel/scripts/fix-cpanel-perl});

diff --git a/script/elevate-cpanel.PL b/script/elevate-cpanel.PL
@@ -1120,7 +1120,8 @@ sub run_stage_4 ($self) {
             $self->ssystem(qw{/usr/bin/dnf config-manager --enable powertools});
             $self->ssystem(qw{/usr/bin/dnf config-manager --enable epel});
 
-            $self->ssystem(qw{/usr/bin/rm -f /usr/local/cpanel/3rdparty/bin/perl});
+            # Break cpanel-perl (NOTE: This only works on perl 5.36)
+            $self->ssystem(qw{/usr/bin/rm -f /usr/local/cpanel/3rdparty/perl/536/cpanel-lib/X/Tiny.pm});
             {
                 local $ENV{'CPANEL_BASE_INSTALL'} = 1;    # Don't fix more than perl itself.
                 $self->ssystem(qw{/usr/local/cpanel/scripts/fix-cpanel-perl});