Merge ~pjdc/ubuntu-mirror-charm/+git/ubuntu-mirror-charm:old-releases-warty-signing-key into ubuntu-mirror-charm:master

Proposed by Paul Collins
Status: Merged
Approved by: Haw Loeung
Approved revision: 2435c78f3547200efc645f3a363b0b66101eae3f
Merged at revision: 8d85893055a886f277a6aba0643da4306bc0d3ec
Proposed branch: ~pjdc/ubuntu-mirror-charm/+git/ubuntu-mirror-charm:old-releases-warty-signing-key
Merge into: ubuntu-mirror-charm:master
Diff against target: 14 lines (+3/-0)
1 file modified
files/check-mirror.sh (+3/-0)
Reviewer Review Type Date Requested Status
Haw Loeung +1 Approve
Canonical IS Reviewers Pending
Review via email: mp+389452@code.launchpad.net

Commit message

use ubuntu-archive-removed-keys.gpg when verifying old-releases, because we check warty

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Haw Loeung (hloeung) wrote :

LGTM

review: Approve (+1)
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 8d85893055a886f277a6aba0643da4306bc0d3ec

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/files/check-mirror.sh b/files/check-mirror.sh
2index 5d8aa4e..979e851 100755
3--- a/files/check-mirror.sh
4+++ b/files/check-mirror.sh
5@@ -88,6 +88,9 @@ case ${role} in
6 cloud-images)
7 keyring_file=/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg
8 ;;
9+ old-releases)
10+ keyring_file=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg
11+ ;;
12 *)
13 keyring_file=/usr/share/keyrings/ubuntu-archive-keyring.gpg
14 ;;

Subscribers

People subscribed via source and target branches