Merge lp://qastaging/~nmessick/ubuntu/quantal/ec2-ami-tools/1.4.0.7 into lp://qastaging/ubuntu/quantal/ec2-ami-tools
Status: | Needs review |
---|---|
Proposed branch: | lp://qastaging/~nmessick/ubuntu/quantal/ec2-ami-tools/1.4.0.7 |
Merge into: | lp://qastaging/ubuntu/quantal/ec2-ami-tools |
Diff against target: |
633 lines (+73/-241) 18 files modified
debian/changelog (+15/-0) debian/patches/point-to-right-place.patch (+1/-1) debian/patches/remove-explicit-regions.patch (+0/-204) debian/patches/series (+0/-1) debian/patches/use-mktemp-like-mkfifo-name.patch (+1/-1) lib/ec2/amitools/bundle.rb (+2/-1) lib/ec2/amitools/bundlevol.rb (+1/-0) lib/ec2/amitools/bundlevolparameters.rb (+7/-0) lib/ec2/amitools/migratebundle.rb (+2/-6) lib/ec2/amitools/migratebundleparameters.rb (+3/-2) lib/ec2/amitools/migratemanifestparameters.rb (+3/-2) lib/ec2/amitools/uploadbundle.rb (+13/-16) lib/ec2/amitools/uploadbundleparameters.rb (+3/-2) lib/ec2/amitools/version.rb (+1/-1) lib/ec2/platform/base/constants.rb (+1/-0) lib/ec2/platform/linux/image.rb (+9/-4) lib/ec2/platform/linux/tar.rb (+10/-0) lib/ec2/platform/solaris/image.rb (+1/-0) |
To merge this branch: | bzr merge lp://qastaging/~nmessick/ubuntu/quantal/ec2-ami-tools/1.4.0.7 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Scott Moser | Needs Fixing | ||
Review via email:
|
Commit message
* New upstream release (1.4.0.7)
- Support for Amazon EC2 in the Sao Paulo region (sa-east-1)
- Support for Amazon EC2 in the Oregon Region (us-west-2)
- Support for EC2 API version 2009-10-31: Amazon EC2 in the Northern California Region (us-west-1)
- Support for EC2 API version 2008-12-01: Amazon EC2 in Europe
- Support for EC2 API version 2008-08-08: Amazon EC2 running Windows Server and SQL Server
- Support for EC2 API version 2008-02-01
- AMI Tools packaged as a ZIP file in addition to the RPM.
- Improved fstab handling: The existing fstab is now bundled into the AMI unless otherwise specified
- Better Ubuntu support: bash is explicitly called where required. This fixes "bad substitution" errors.
Description of the change
This is an upgrade to the 1.4.0.7 version of the Amazon EC2 AMI tools.
All of the patches present in the 1.4.0.2 of the Ubuntu package have been applied, with the exception of the "remove-
Unmerged revisions
- 16. By Nick Messick
-
* New upstream release (1.4.0.7)
- Support for Amazon EC2 in the Sao Paulo region (sa-east-1)
- Support for Amazon EC2 in the Oregon Region (us-west-2)
- Support for EC2 API version 2009-10-31: Amazon EC2 in the Northern California Region (us-west-1)
- Support for EC2 API version 2008-12-01: Amazon EC2 in Europe
- Support for EC2 API version 2008-08-08: Amazon EC2 running Windows Server and SQL Server
- Support for EC2 API version 2008-02-01
- AMI Tools packaged as a ZIP file in addition to the RPM.
- Improved fstab handling: The existing fstab is now bundled into the AMI unless otherwise specified
- Better Ubuntu support: bash is explicitly called where required. This fixes "bad substitution" errors.
Hi, ec2-ami- tools-1. 4.0.7.tar. gz explicit- regions. patch. The changes provided by Amazon are still insufficient, as arrival of a new region means we have to ship an explicit patch to add the hard coded region list. The patch provided there knows explicitly of a list of regions, but then assumes that if ec2.<region> .amazon. aws.com exists as a dns record that the region is legitimate. bazaar. launchpad. net/~ubuntu- branches/ ubuntu/ quantal/ iamcli/ quantal/ view/head: /debian/ repack- zip) and then done something like: ./repack.zip http:// s3.amazonaws. com/ec2- downloads/ ec2-ami- tools-1. 4.0.7.zip
Thanks for taking the time to put this together.
A few things stick out on first glance:
- your changelog entry calls out support for several regions that were previously known. The current archive version (1.4.0.2) knows about up to 'us-west-2'. Changelogs should generally call out changes since last ubuntu package.
- it doesn't seem like you've merged the upstream source in correctly. You should start off by doing something like:
bzr merge-upstream --version 1.4.0.7 ../../dl/
Then quilt push ... quilt refresh .. quilt pop
- We want to at very least keep the intent of remove-
- note, for getting a tarball from a zip, I've used 'repack-zip' that i put together in the iamcli package (http://
I do realize that you probably spent considerable time figuring out just how to work with this package and for that I apologize. Thanks for the work, fix up those items and we can get a new version uploaded.
Also, feel free to document anything that you think might make this easier for someone else.