MAAS

Merge lp:~julian-edwards/maas/1.2 into lp:maas/1.2

  1. 1.2
  2. Merge into 1.2
Proposed by Julian Edwards
Status: Merged
Approved by: Julian Edwards
Approved revision: no longer in the source branch.
Merged at revision: 1383
Proposed branch: lp:~julian-edwards/maas/1.2
Merge into: lp:maas/1.2
Diff against target: 13 lines (+3/-0)
1 file modified
scripts/maas-import-pxe-files (+3/-0)
To merge this branch: bzr merge lp:~julian-edwards/maas/1.2
Reviewer Review Type Date Requested Status
Julian Edwards (community) Approve
Review via email: mp+184919@code.launchpad.net

Commit message

Backport trunk r1585: Fix a crash in maas-import-pxe-files caused by an unset environment variable.

To post a comment you must log in.
Revision history for this message
Julian Edwards (julian-edwards) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scripts/maas-import-pxe-files'
2--- scripts/maas-import-pxe-files 2013-09-06 02:55:28 +0000
3+++ scripts/maas-import-pxe-files 2013-09-11 03:42:46 +0000
4@@ -21,6 +21,9 @@
5 # Location of the GPG keyring for the Ubuntu archive.
6 GPG_KEYRING="${GPG_KEYRING:-/usr/share/keyrings/ubuntu-archive-keyring.gpg}"
7
8+# Whether to check GPG keys (necessary for testing of this script).
9+IGNORE_GPG="${IGNORE_GPG:-}"
10+
11 # Download locations for Ubuntu releases.
12 MAIN_ARCHIVE=${MAIN_ARCHIVE:-http://archive.ubuntu.com/ubuntu/}
13 PORTS_ARCHIVE=${PORTS_ARCHIVE:-http://ports.ubuntu.com/ubuntu-ports/}

Subscribers

People subscribed via source and target branches

to status/vote changes: