From 132dbc66fa67a804f8a52df4596a2b91eea4f95f Mon Sep 17 00:00:00 2001 From: Ludovic <54670129+lbr38@users.noreply.github.com> Date: Tue, 21 Jan 2025 17:12:27 +0100 Subject: [PATCH] patch --- www/controllers/Repo/Source/Deb.php | 9 ++++++--- www/controllers/Repo/Source/Rpm.php | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/www/controllers/Repo/Source/Deb.php b/www/controllers/Repo/Source/Deb.php index 4a4d1470..40e12fd0 100644 --- 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 index 0314ad37..22cb520e 100644 --- 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 );