patch

lbr38 · Jan 21, 2025 · 132dbc6 · 132dbc6
1 parent f86c890
commit 132dbc6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/www/controllers/Repo/Source/Deb.php b/www/controllers/Repo/Source/Deb.php
@@ -240,12 +240,15 @@ public function addGpgKey(int $id, int $distributionId, string $gpgKeyUrl, strin
          */
         foreach ($fingerprints as $fingerprint) {
             // Ignore fingerprint if already exists
-            foreach ($currentParams['distributions'][$distributionId]['gpgkeys'] as $gpgKeyDefinition) {
-                if (isset($gpgKeyDefinition['fingerprint']) and $gpgKeyDefinition['fingerprint'] == $fingerprint) {
-                    continue 2;
+            if (!empty($currentParams['distributions'][$distributionId]['gpgkeys'])) {
+                foreach ($currentParams['distributions'][$distributionId]['gpgkeys'] as $gpgKeyDefinition) {
+                    if (isset($gpgKeyDefinition['fingerprint']) and $gpgKeyDefinition['fingerprint'] == $fingerprint) {
+                        continue 2;
+                    }
                 }
             }
 
+            // Otherwise add the fingerprint
             $currentParams['distributions'][$distributionId]['gpgkeys'][] = array(
                 'fingerprint' => $fingerprint
             );

diff --git a/www/controllers/Repo/Source/Rpm.php b/www/controllers/Repo/Source/Rpm.php
@@ -156,12 +156,15 @@ public function addGpgKey(int $id, int $releaseverId, string $gpgKeyUrl, string
          */
         foreach ($fingerprints as $fingerprint) {
             // Ignore fingerprint if already exists
-            foreach ($currentParams['releasever'][$releaseverId]['gpgkeys'] as $gpgKeyDefinition) {
-                if (isset($gpgKeyDefinition['fingerprint']) and $gpgKeyDefinition['fingerprint'] == $fingerprint) {
-                    continue 2;
+            if (!empty($currentParams['releasever'][$releaseverId]['gpgkeys'])) {
+                foreach ($currentParams['releasever'][$releaseverId]['gpgkeys'] as $gpgKeyDefinition) {
+                    if (isset($gpgKeyDefinition['fingerprint']) and $gpgKeyDefinition['fingerprint'] == $fingerprint) {
+                        continue 2;
+                    }
                 }
             }
 
+            // Otherwise add the fingerprint
             $currentParams['releasever'][$releaseverId]['gpgkeys'][] = array(
                 'fingerprint' => $fingerprint
             );