launchpad-reviewers team mailing list archive

[Gary Poster <gary.poster@xxxxxxxxxxxxx>]

Gary Poster has proposed merging lp:~gary/launchpad/ec2lucid into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)


Make ec2 work on Lucid.
-- 
https://code.launchpad.net/~gary/launchpad/ec2lucid/+merge/42179
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~gary/launchpad/ec2lucid into lp:launchpad.

=== modified file 'lib/devscripts/ec2test/builtins.py'
--- lib/devscripts/ec2test/builtins.py	2010-11-24 17:03:39 +0000
+++ lib/devscripts/ec2test/builtins.py	2010-11-29 21:35:32 +0000
@@ -568,8 +568,8 @@
         # fresh Ubuntu images and cause havoc if the locales they refer to are
         # not available. We kill them here to ease bootstrapping, then we
         # later modify the image to prevent sshd from accepting them.
-        os.environ.pop("LANG")
-        os.environ.pop("LC_ALL")
+        os.environ.pop("LANG", None)
+        os.environ.pop("LC_ALL", None)
 
         credentials = EC2Credentials.load_from_file()