maas-images

Merge lp:~smoser/maas-images/trunk.keyring into lp:maas-images

  1. trunk.keyring
  2. Merge into maas-ephemerals
Proposed by Scott Moser
Status: Merged
Merged at revision: 348
Proposed branch: lp:~smoser/maas-images/trunk.keyring
Merge into: lp:maas-images
Diff against target: 16 lines (+4/-0)
1 file modified
meph2/netinst.py (+4/-0)
To merge this branch: bzr merge lp:~smoser/maas-images/trunk.keyring
Reviewer Review Type Date Requested Status
Lee Trager (community) Approve
Review via email: mp+310349@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Lee Trager (ltrager) wrote :

LGTM!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'keyring.gpg'
2Binary files keyring.gpg 1970-01-01 00:00:00 +0000 and keyring.gpg 2016-11-08 18:33:25 +0000 differ
3=== modified file 'meph2/netinst.py'
4--- meph2/netinst.py 2016-08-01 19:15:59 +0000
5+++ meph2/netinst.py 2016-11-08 18:33:25 +0000
6@@ -62,6 +62,10 @@
7 INVALID_KERNEL_FLAVORS = ("xen", "gtk")
8
9 GPG_KEYRING = "/usr/share/keyrings/ubuntu-archive-keyring.gpg"
10+ALT_GPG_KEYRING = os.path.join(
11+ os.path.dirname(__file__), "..", "keyring.gpg")
12+if os.path.exists(ALT_GPG_KEYRING):
13+ GPG_KEYRING = ALT_GPG_KEYRING
14 CONTENT_ID = "com.ubuntu.installer:released:netboot"
15
16 # see get_kfile_key for how a file item key is generated.

Subscribers

People subscribed via source and target branches