Merge pull request #553 from cpanel/RE-964

Avoid Perl error in 'Elevate::Components::Repositories'
cpanel · Nov 18, 2024 · a8ede6c · a8ede6c
2 parents e9f87eb + 8796189
commit a8ede6c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/elevate-cpanel b/elevate-cpanel
@@ -5588,7 +5588,7 @@ EOS
         $self->{_yum_repos_path_using_invalid_syntax} = [];
         $self->{_yum_repos_to_disable}                = [];
         $self->{_yum_repos_unsupported_with_packages} = [];
-        $self->{_duplicate_repoids}                   = [];
+        $self->{_duplicate_repoids}                   = {};
 
         my @vetted_repos = Elevate::OS::vetted_yum_repo();
 
@@ -5716,6 +5716,7 @@ EOS
     }
 
     sub _autofix_duplicate_repoids ($self) {
+        return unless ref $self->{_duplicate_repoids} && ref $self->{_duplicate_repoids} eq 'HASH';
         my %duplicate_ids = $self->{_duplicate_repoids}->%*;
         foreach my $id ( keys %duplicate_ids ) {
             if ( $id =~ m/^MariaDB[0-9]+/ ) {

diff --git a/lib/Elevate/Components/Repositories.pm b/lib/Elevate/Components/Repositories.pm
@@ -326,7 +326,7 @@ sub _check_yum_repos ($self) {
     $self->{_yum_repos_path_using_invalid_syntax} = [];
     $self->{_yum_repos_to_disable}                = [];
     $self->{_yum_repos_unsupported_with_packages} = [];
-    $self->{_duplicate_repoids}                   = [];
+    $self->{_duplicate_repoids}                   = {};
 
     my @vetted_repos = Elevate::OS::vetted_yum_repo();
 
@@ -458,6 +458,7 @@ sub _check_yum_repos ($self) {
 }
 
 sub _autofix_duplicate_repoids ($self) {
+    return unless ref $self->{_duplicate_repoids} && ref $self->{_duplicate_repoids} eq 'HASH';
     my %duplicate_ids = $self->{_duplicate_repoids}->%*;
     foreach my $id ( keys %duplicate_ids ) {
         if ( $id =~ m/^MariaDB[0-9]+/ ) {