Merge lp://staging/~gary/launchpad/bug660628 into lp://staging/launchpad
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Brad Crittenden | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 11718 | ||||
Proposed branch: | lp://staging/~gary/launchpad/bug660628 | ||||
Merge into: | lp://staging/launchpad | ||||
Diff against target: |
45 lines (+14/-0) 1 file modified
lib/devscripts/ec2test/instance.py (+14/-0) |
||||
To merge this branch: | bzr merge lp://staging/~gary/launchpad/bug660628 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Brad Crittenden (community) | code | Approve | |
Review via email:
|
Commit message
Make update-image work smoothly on Lucid
Description of the change
As described in bug 660628, ec2 update-image couldn't find the necessary ec2 commands anymore to bundle an image on the instance, because of the change described in http://
I also added a quick hint to people if they do not have ec2-register on their local system, to hopefully save them a bit of the time I spent.
I did not add tests of these changes.
- The changes in regards to the installation of the ec2 packages on the remote machine did not seem to be conducive to valuable tests to me.
- I could more easily be convinced of making a test of the local ec2-register test, but again, it did not seem valuable to me. IMO test time would be better spent on testing the bigger picture, and I don't think working on that until I also tackle bug 660631 (switch to eucalyptus). I intend to tackle that next.
I should also mention that make lint was unhappy because of the long lines in the code that is run as a script on the remote machine. I don't think that should change, myself.