Merge lp:~jml/launchpad/ec2test-karmic-bug-424197 into lp:launchpad

Proposed by Jonathan Lange
Status: Merged
Approved by: Jonathan Lange
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~jml/launchpad/ec2test-karmic-bug-424197
Merge into: lp:launchpad
Diff against target: None lines
To merge this branch: bzr merge lp:~jml/launchpad/ec2test-karmic-bug-424197
Reviewer Review Type Date Requested Status
Michael Hudson-Doyle Approve
Canonical Launchpad Engineering Pending
Review via email: mp+11265@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jonathan Lange (jml) wrote :

Remove the version check from ./utilities/ec2test.py, so that ec2test.py works on karmic.

Revision history for this message
Michael Hudson-Doyle (mwhudson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'utilities/ec2test.py'
--- utilities/ec2test.py 2009-08-31 05:15:30 +0000
+++ utilities/ec2test.py 2009-09-06 10:04:18 +0000
@@ -52,19 +52,6 @@
5252
53#############################################################################53#############################################################################
54# Try to guide users past support problems we've encountered before54# Try to guide users past support problems we've encountered before
55if boto.Version != '1.5b':
56 msg = [
57 'Your version of python-boto (%s) is not supported.' %(boto.Version,),
58 'See https://wiki.canonical.com/Launchpad/Experiments/FiveMinutesPQM '
59 'for instructions, or search for "python-boto" among the PPAs at '
60 'https://launchpad.net/~launchpad/+archive/ppa.']
61 if not re.match('/var/lib/python-support/python2.[56]/boto',
62 os.path.dirname(boto.__file__)):
63 # Was this boto supplied by a deb?
64 msg.append('WARNING: it looks like your version of python-boto '
65 'might not be from a debian package. It may be masking '
66 'the version installed by the package manager.')
67 raise RuntimeError(' '.join(msg))
68if not paramiko.__version__.startswith('1.7.4'):55if not paramiko.__version__.startswith('1.7.4'):
69 raise RuntimeError('Your version of paramiko (%s) is not supported. '56 raise RuntimeError('Your version of paramiko (%s) is not supported. '
70 'Please use 1.7.4.' % (paramiko.__version__,))57 'Please use 1.7.4.' % (paramiko.__version__,))