Launchpad itself

Merge lp:~allenap/launchpad/ec2-niceties into lp:launchpad

  1. ec2-niceties
  2. Merge into devel
Proposed by Gavin Panella
Status: Merged
Approved by: Brad Crittenden
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~allenap/launchpad/ec2-niceties
Merge into: lp:launchpad
Diff against target: 24 lines
2 files modified
lib/devscripts/ec2test/__init__.py (+4/-0)
lib/devscripts/ec2test/account.py (+1/-1)
To merge this branch: bzr merge lp:~allenap/launchpad/ec2-niceties
Reviewer Review Type Date Requested Status
Brad Crittenden (community) code Approve
Review via email: mp+12593@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Gavin Panella (allenap) wrote :

Ignore deprecation warnings in boto and add a newline to a log message.

Revision history for this message
Brad Crittenden (bac) wrote :

Nice!

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/devscripts/ec2test/__init__.py'
2--- lib/devscripts/ec2test/__init__.py 2009-09-18 02:23:13 +0000
3+++ lib/devscripts/ec2test/__init__.py 2009-09-29 15:55:21 +0000
4@@ -19,3 +19,7 @@
5 # maybe add similar check for bzrlib?
6 # End
7 #############################################################################
8+
9+import warnings
10+warnings.filterwarnings(
11+ "ignore", category=DeprecationWarning, module="boto")
12
13=== modified file 'lib/devscripts/ec2test/account.py'
14--- lib/devscripts/ec2test/account.py 2009-09-14 05:14:44 +0000
15+++ lib/devscripts/ec2test/account.py 2009-09-29 15:55:21 +0000
16@@ -99,7 +99,7 @@
17 # XXX: JonathanLange 2009-06-05: If the security group exists
18 # already, verify that the current IP is permitted; if it is
19 # not, make an INFO log and add the current IP.
20- self.log("Security group already in use, so reusing.")
21+ self.log("Security group already in use, so reusing.\n")
22 return group
23
24 security_group = self.conn.create_security_group(