Launchpad itself

Merge lp:~gary/launchpad/ec2lucid into lp:launchpad

  1. ec2lucid
  2. Merge into devel
Proposed by Gary Poster on 2010-11-29
Status: Merged
Approved by: Aaron Bentley on 2010-11-29
Approved revision: no longer in the source branch.
Merged at revision: 11999
Proposed branch: lp:~gary/launchpad/ec2lucid
Merge into: lp:launchpad
Diff against target: 13 lines (+2/-2)
1 file modified
lib/devscripts/ec2test/builtins.py (+2/-2)
To merge this branch: bzr merge lp:~gary/launchpad/ec2lucid
Reviewer Review Type Date Requested Status
Aaron Bentley (community) 2010-11-29 Approve on 2010-11-29
Review via email: mp+42179@code.launchpad.net

Commit Message

[r=abentley][ui=none][no-qa] Make ec2 work on Lucid.

Description of the Change

Make ec2 work on Lucid.

To post a comment you must log in.
Aaron Bentley (abentley) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/devscripts/ec2test/builtins.py'
2--- lib/devscripts/ec2test/builtins.py 2010-11-24 17:03:39 +0000
3+++ lib/devscripts/ec2test/builtins.py 2010-11-29 21:36:06 +0000
4@@ -568,8 +568,8 @@
5 # fresh Ubuntu images and cause havoc if the locales they refer to are
6 # not available. We kill them here to ease bootstrapping, then we
7 # later modify the image to prevent sshd from accepting them.
8- os.environ.pop("LANG")
9- os.environ.pop("LC_ALL")
10+ os.environ.pop("LANG", None)
11+ os.environ.pop("LC_ALL", None)
12
13 credentials = EC2Credentials.load_from_file()
14