rpms/euca2ools/devel euca2ools-1.2-bzr251_252-versionstr.patch, NONE, 1.1 euca2ools-1.2-bzr255-rcpath.patch, NONE, 1.1 euca2ools-1.2-bzr260-describe-order.patch, NONE, 1.1 euca2ools-1.2-bzr267-path-processing.patch, NONE, 1.1 euca2ools-1.2-bzr269-createvol-doc.patch, NONE, 1.1 euca2ools-1.2-bzr271-imgattribute-doc.patch, NONE, 1.1 euca2ools-1.2-bzr273-blockdevmapping.patch, NONE, 1.1 euca2ools.spec, 1.3, 1.4
gholms
gholms at fedoraproject.org
Tue Mar 23 03:57:27 UTC 2010
- Previous message: File euca2ools-1.2-bzr273-blockdevmapping.patch uploaded to lookaside cache by gholms
- Next message: rpms/euca2ools/F-12 euca2ools-1.2-bzr251_252-versionstr.patch, NONE, 1.1 euca2ools-1.2-bzr255-rcpath.patch, NONE, 1.1 euca2ools-1.2-bzr260-describe-order.patch, NONE, 1.1 euca2ools-1.2-bzr267-path-processing.patch, NONE, 1.1 euca2ools-1.2-bzr269-createvol-doc.patch, NONE, 1.1 euca2ools-1.2-bzr271-imgattribute-doc.patch, NONE, 1.1 euca2ools-1.2-bzr273-blockdevmapping.patch, NONE, 1.1 euca2ools.spec, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: gholms
Update of /cvs/pkgs/rpms/euca2ools/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4133
Modified Files:
euca2ools.spec
Added Files:
euca2ools-1.2-bzr251_252-versionstr.patch
euca2ools-1.2-bzr255-rcpath.patch
euca2ools-1.2-bzr260-describe-order.patch
euca2ools-1.2-bzr267-path-processing.patch
euca2ools-1.2-bzr269-createvol-doc.patch
euca2ools-1.2-bzr271-imgattribute-doc.patch
euca2ools-1.2-bzr273-blockdevmapping.patch
Log Message:
* Mon Mar 22 2010 Garrett Holmstrom <gholms at fedoraproject.org> - 1.2-2
- Fix bad version reporting [LP:522396]
- Fix broken rc file searching [LP:516738 LP:524652]
- Fix reversed kernel+ramdisk display order in euca-describe-images [LP:256697]
- Fix broken file patch processing [LP:522060]
- Make euca-create-volume documentation consistent [LP:542097]
- Correct help files for euca-{modify,reset}-image-attribute [LP:543559]
- Fix euca-bundle-image --block-device-mapping [575166]
euca2ools-1.2-bzr251_252-versionstr.patch:
bin/euca-add-group | 3 +--
bin/euca-add-keypair | 3 +--
bin/euca-allocate-address | 3 +--
bin/euca-associate-address | 3 +--
bin/euca-attach-volume | 3 +--
bin/euca-authorize | 3 +--
bin/euca-bundle-image | 3 +--
bin/euca-bundle-vol | 3 +--
bin/euca-confirm-product-instance | 3 +--
bin/euca-create-snapshot | 3 +--
bin/euca-create-volume | 3 +--
bin/euca-delete-bundle | 3 +--
bin/euca-delete-group | 3 +--
bin/euca-delete-keypair | 3 +--
bin/euca-delete-snapshot | 3 +--
bin/euca-delete-volume | 3 +--
bin/euca-deregister | 3 +--
bin/euca-describe-addresses | 3 +--
bin/euca-describe-availability-zones | 3 +--
bin/euca-describe-groups | 3 +--
bin/euca-describe-image-attribute | 3 +--
bin/euca-describe-images | 3 +--
bin/euca-describe-instances | 3 +--
bin/euca-describe-keypairs | 3 +--
bin/euca-describe-regions | 3 +--
bin/euca-describe-snapshots | 3 +--
bin/euca-describe-volumes | 3 +--
bin/euca-detach-volume | 3 +--
bin/euca-disassociate-address | 3 +--
bin/euca-download-bundle | 3 +--
bin/euca-get-console-output | 3 +--
bin/euca-modify-image-attribute | 3 +--
bin/euca-reboot-instances | 3 +--
bin/euca-register | 3 +--
bin/euca-release-address | 3 +--
bin/euca-reset-image-attribute | 3 +--
bin/euca-revoke | 3 +--
bin/euca-run-instances | 3 +--
bin/euca-terminate-instances | 3 +--
bin/euca-unbundle | 3 +--
bin/euca-upload-bundle | 3 +--
bin/euca-version | 5 ++---
euca2ools/euca2ools/__init__.py | 9 +++++++--
43 files changed, 50 insertions(+), 87 deletions(-)
--- NEW FILE euca2ools-1.2-bzr251_252-versionstr.patch ---
=== modified file 'bin/euca-add-group'
--- bin/euca-add-group 2010-02-16 19:56:56 +0000
+++ bin/euca-add-group 2010-02-16 20:46:57 +0000
@@ -49,14 +49,13 @@
"""
-version_string = """ euca-add-group version: 1.0 (BSD)"""
def usage():
print usage_string
Util().usage()
def version():
- print version_string
+ print Util().version()
sys.exit()
def display_group(group):
=== modified file 'bin/euca-add-keypair'
--- bin/euca-add-keypair 2010-02-16 19:56:56 +0000
+++ bin/euca-add-keypair 2010-02-16 20:46:57 +0000
@@ -48,14 +48,13 @@
"""
-version_string = """ euca-add-keypair version: 1.0 (BSD)"""
def usage():
print usage_string
Util().usage()
def version():
- print version_string
+ print Util().version()
sys.exit()
def display_keypair(keypair):
=== modified file 'bin/euca-allocate-address'
--- bin/euca-allocate-address 2010-02-16 19:56:56 +0000
+++ bin/euca-allocate-address 2010-02-16 20:46:57 +0000
@@ -44,14 +44,13 @@
"""
-version_string = """ euca-allocate-address version: 1.0 (BSD)"""
def usage():
print usage_string
Util().usage()
def version():
- print version_string
+ print Util().version()
sys.exit()
def main():
=== modified file 'bin/euca-associate-address'
--- bin/euca-associate-address 2010-02-16 19:56:56 +0000
+++ bin/euca-associate-address 2010-02-16 20:46:57 +0000
@@ -51,14 +51,13 @@
"""
-version_string = """ euca-associate-address version: 1.0 (BSD)"""
def usage():
print usage_string
Util().usage()
def version():
- print version_string
+ print Util().version()
sys.exit()
def main():
=== modified file 'bin/euca-attach-volume'
--- bin/euca-attach-volume 2010-02-16 19:56:56 +0000
+++ bin/euca-attach-volume 2010-02-16 20:46:57 +0000
@@ -53,14 +53,13 @@
"""
-version_string = """ euca-attach-volume version: 1.0 (BSD)"""
def usage():
print usage_string
Util().usage()
def version():
- print version_string
+ print Util().version()
sys.exit()
def main():
=== modified file 'bin/euca-authorize'
--- bin/euca-authorize 2010-02-16 19:56:56 +0000
+++ bin/euca-authorize 2010-02-16 20:46:57 +0000
@@ -63,14 +63,13 @@
"""
-version_string = """ euca-authorize version: 1.0 (BSD)"""
def usage():
print usage_string
Util().usage(compat=True)
def version():
- print version_string
+ print Util().version()
sys.exit()
def main():
=== modified file 'bin/euca-bundle-image'
--- bin/euca-bundle-image 2009-11-28 05:53:18 +0000
+++ bin/euca-bundle-image 2010-02-16 20:46:57 +0000
@@ -73,7 +73,6 @@
--batch Run in batch mode (compatibility only. has no effect).
"""
-version_string = """ euca-bundle-image version: 1.0 (BSD)"""
def usage():
print usage_string
@@ -81,7 +80,7 @@
sys.exit()
def version():
- print version_string
+ print Util().version()
sys.exit()
def get_block_devs(mapping):
=== modified file 'bin/euca-bundle-vol'
--- bin/euca-bundle-vol 2009-11-28 05:53:18 +0000
+++ bin/euca-bundle-vol 2010-02-16 20:46:57 +0000
@@ -88,14 +88,13 @@
MAX_IMAGE_SIZE = 1024 * 10
-version_string = """ euca-bundle-vol version: 1.0 (BSD)"""
def usage():
print usage_string
sys.exit()
def version():
- print version_string
+ print Util().version()
sys.exit()
def check_root():
=== modified file 'bin/euca-confirm-product-instance'
--- bin/euca-confirm-product-instance 2010-02-16 19:56:56 +0000
+++ bin/euca-confirm-product-instance 2010-02-16 20:46:57 +0000
@@ -50,14 +50,13 @@
"""
-version_string = """ euca-confirm-product-instance version: 1.0 (BSD)"""
def usage():
print usage_string
Util().usage()
def version():
- print version_string
+ print Util().version()
sys.exit()
=== modified file 'bin/euca-create-snapshot'
--- bin/euca-create-snapshot 2010-02-16 19:56:56 +0000
+++ bin/euca-create-snapshot 2010-02-16 20:46:57 +0000
@@ -48,14 +48,13 @@
"""
-version_string = """ euca-create-snapshot version: 1.0 (BSD)"""
def usage():
print usage_string
Util().usage()
def version():
- print version_string
+ print Util().version()
sys.exit()
def display_snapshot(snapshot):
=== modified file 'bin/euca-create-volume'
--- bin/euca-create-volume 2010-02-16 19:56:56 +0000
+++ bin/euca-create-volume 2010-02-16 20:46:57 +0000
@@ -53,14 +53,13 @@
"""
-version_string = """ euca-create-volume version: 1.0 (BSD)"""
def usage():
print usage_string
Util().usage(compat=True)
def version():
- print version_string
+ print Util().version()
sys.exit()
def display_volume(volume):
=== modified file 'bin/euca-delete-bundle'
--- bin/euca-delete-bundle 2010-02-16 19:56:56 +0000
+++ bin/euca-delete-bundle 2010-02-16 20:46:57 +0000
@@ -65,14 +65,13 @@
"""
-version_string = """ euca-delete-bundle version: 1.0 (BSD)"""
def usage():
print usage_string
Util().usage()
def version():
- print version_string
+ print Util().version()
sys.exit()
def ensure_bucket(connection, bucket):
=== modified file 'bin/euca-delete-group'
--- bin/euca-delete-group 2010-02-16 19:56:56 +0000
+++ bin/euca-delete-group 2010-02-16 20:46:57 +0000
@@ -48,14 +48,13 @@
"""
-version_string = """ euca-delete-group version: 1.0 (BSD)"""
def usage():
print usage_string
Util().usage()
def version():
- print version_string
+ print Util().version()
sys.exit()
def main():
=== modified file 'bin/euca-delete-keypair'
--- bin/euca-delete-keypair 2010-02-16 19:56:56 +0000
+++ bin/euca-delete-keypair 2010-02-16 20:46:57 +0000
@@ -48,14 +48,13 @@
"""
-version_string = """ euca-delete-keypair version: 1.0 (BSD)"""
def usage():
print usage_string
Util().usage()
def version():
- print version_string
+ print Util().version()
sys.exit()
def display_keypair(keypair):
=== modified file 'bin/euca-delete-snapshot'
--- bin/euca-delete-snapshot 2010-02-16 19:56:56 +0000
+++ bin/euca-delete-snapshot 2010-02-16 20:46:57 +0000
@@ -48,14 +48,13 @@
"""
-version_string = """ euca-delete-snapshot version: 1.0 (BSD)"""
def usage():
print usage_string
Util().usage()
def version():
- print version_string
+ print Util().version()
sys.exit()
def main():
=== modified file 'bin/euca-delete-volume'
--- bin/euca-delete-volume 2010-02-16 19:56:56 +0000
+++ bin/euca-delete-volume 2010-02-16 20:46:57 +0000
@@ -48,14 +48,13 @@
"""
-version_string = """ euca-delete-volume version: 1.0 (BSD)"""
def usage():
print usage_string
Util().usage()
def version():
- print version_string
+ print Util().version()
sys.exit()
=== modified file 'bin/euca-deregister'
--- bin/euca-deregister 2010-02-16 19:56:56 +0000
+++ bin/euca-deregister 2010-02-16 20:46:57 +0000
@@ -48,14 +48,13 @@
"""
-version_string = """ euca-deregister version: 1.0 (BSD)"""
def usage():
print usage_string
Util().usage()
def version():
- print version_string
+ print Util().version()
sys.exit()
def main():
=== modified file 'bin/euca-describe-addresses'
--- bin/euca-describe-addresses 2010-02-16 19:56:56 +0000
+++ bin/euca-describe-addresses 2010-02-16 20:46:57 +0000
@@ -46,14 +46,13 @@
"""
-version_string = """ euca-describe-addresses version: 1.0 (BSD)"""
def usage():
print usage_string
Util().usage()
def version():
- print version_string
+ print Util().version()
sys.exit()
def display_addresses(addresses, address_ids):
=== modified file 'bin/euca-describe-availability-zones'
--- bin/euca-describe-availability-zones 2010-02-16 19:56:56 +0000
+++ bin/euca-describe-availability-zones 2010-02-16 20:46:57 +0000
@@ -48,14 +48,13 @@
"""
-version_string = """ euca-describe-availability-zones version: 1.0 (BSD)"""
def usage():
print usage_string
Util().usage()
def version():
- print version_string
+ print Util().version()
sys.exit()
def display_zones(zones, zone_ids, region):
=== modified file 'bin/euca-describe-groups'
--- bin/euca-describe-groups 2010-02-16 19:56:56 +0000
+++ bin/euca-describe-groups 2010-02-16 20:46:57 +0000
@@ -46,14 +46,13 @@
"""
-version_string = """ euca-describe-groups version: 1.0 (BSD)"""
def usage():
print usage_string
Util().usage()
def version():
- print version_string
+ print Util().version()
sys.exit()
def display_groups(groups, group_ids):
=== modified file 'bin/euca-describe-image-attribute'
--- bin/euca-describe-image-attribute 2010-02-16 19:56:56 +0000
+++ bin/euca-describe-image-attribute 2010-02-16 20:46:57 +0000
@@ -56,14 +56,13 @@
"""
-version_string = """ euca-describe-image-attribute version: 1.0 (BSD)"""
def usage():
print usage_string
Util().usage()
def version():
- print version_string
+ print Util().version()
sys.exit()
=== modified file 'bin/euca-describe-images'
--- bin/euca-describe-images 2010-02-16 19:56:56 +0000
+++ bin/euca-describe-images 2010-02-16 20:46:57 +0000
@@ -52,14 +52,13 @@
"""
-version_string = """ euca-describe-images version: 1.0 (BSD)"""
def usage():
print usage_string
Util().usage(compat=True)
def version():
- print version_string
+ print Util().version()
sys.exit()
def display_images(images, image_ids):
=== modified file 'bin/euca-describe-instances'
--- bin/euca-describe-instances 2010-02-16 19:56:56 +0000
+++ bin/euca-describe-instances 2010-02-16 20:46:57 +0000
@@ -47,14 +47,13 @@
"""
-version_string = """ euca-describe-instances version: 1.0 (BSD)"""
def usage():
print usage_string
Util().usage()
def version():
- print version_string
+ print Util().version()
sys.exit()
def display_reservations(reservations, instance_ids):
=== modified file 'bin/euca-describe-keypairs'
--- bin/euca-describe-keypairs 2010-02-16 19:56:56 +0000
+++ bin/euca-describe-keypairs 2010-02-16 20:46:57 +0000
@@ -47,14 +47,13 @@
"""
-version_string = """ euca-describe-key-pairs version: 1.0 (BSD)"""
def usage():
print usage_string
Util().usage()
def version():
- print version_string
+ print Util().version()
sys.exit()
def display_keypairs(keypairs, keypair_ids):
=== modified file 'bin/euca-describe-regions'
--- bin/euca-describe-regions 2010-02-16 19:56:56 +0000
+++ bin/euca-describe-regions 2010-02-16 20:46:57 +0000
@@ -47,14 +47,13 @@
"""
-version_string = """ euca-describe-regions version: 1.0 (BSD)"""
def usage():
print usage_string
Util().usage()
def version():
- print version_string
+ print Util().version()
sys.exit()
def display_regions(regions, region_ids):
=== modified file 'bin/euca-describe-snapshots'
--- bin/euca-describe-snapshots 2010-02-16 19:56:56 +0000
+++ bin/euca-describe-snapshots 2010-02-16 20:46:57 +0000
@@ -47,14 +47,13 @@
"""
-version_string = """ euca-describe-snapshot version: 1.0 (BSD)"""
def usage():
print usage_string
Util().usage()
def version():
- print version_string
+ print Util().version()
sys.exit()
def display_snapshots(snapshots, snapshot_ids):
=== modified file 'bin/euca-describe-volumes'
--- bin/euca-describe-volumes 2010-02-16 19:56:56 +0000
+++ bin/euca-describe-volumes 2010-02-16 20:46:57 +0000
@@ -47,14 +47,13 @@
"""
-version_string = """ euca-describe-volumes version: 1.0 (BSD)"""
def usage():
print usage_string
Util().usage()
def version():
- print version_string
+ print Util().version()
sys.exit()
def display_volumes(volumes, volume_ids):
=== modified file 'bin/euca-detach-volume'
--- bin/euca-detach-volume 2010-02-16 19:56:56 +0000
+++ bin/euca-detach-volume 2010-02-16 20:46:57 +0000
@@ -48,14 +48,13 @@
"""
-version_string = """ euca-detach-volume version: 1.0 (BSD)"""
def usage():
print usage_string
Util().usage()
def version():
- print version_string
+ print Util().version()
sys.exit()
def get_volume_params(volumes, volume_id):
=== modified file 'bin/euca-disassociate-address'
--- bin/euca-disassociate-address 2010-02-16 19:56:56 +0000
+++ bin/euca-disassociate-address 2010-02-16 20:46:57 +0000
@@ -48,14 +48,13 @@
"""
-version_string = """ euca-disassociate-address version: 1.0 (BSD)"""
def usage():
print usage_string
Util().usage()
def version():
- print version_string
+ print Util().version()
sys.exit()
def main():
=== modified file 'bin/euca-download-bundle'
--- bin/euca-download-bundle 2010-02-16 19:56:56 +0000
+++ bin/euca-download-bundle 2010-02-16 20:46:57 +0000
@@ -57,14 +57,13 @@
"""
-version_string = """ euca-download-bundle version: 1.0 (BSD)"""
def usage():
print usage_string
Util().usage()
def version():
- print version_string
+ print Util().version()
sys.exit()
def ensure_bucket(connection, bucket):
=== modified file 'bin/euca-get-console-output'
--- bin/euca-get-console-output 2010-02-16 19:56:56 +0000
+++ bin/euca-get-console-output 2010-02-16 20:46:57 +0000
@@ -48,14 +48,13 @@
"""
-version_string = """ euca-get-console-output version: 1.0 (BSD)"""
def usage():
print usage_string
Util().usage()
def version():
- print version_string
+ print Util().version()
sys.exit()
def display_console_output(console_output):
=== modified file 'bin/euca-modify-image-attribute'
--- bin/euca-modify-image-attribute 2010-02-16 19:56:56 +0000
+++ bin/euca-modify-image-attribute 2010-02-16 20:46:57 +0000
@@ -57,14 +57,13 @@
-r, --remove Entity (typically, user id) to remove.
"""
-version_string = """ euca-modify-image-attribute version: 1.0 (BSD)"""
def usage():
print usage_string
Util().usage(compat=True)
def version():
- print version_string
+ print Util().version()
sys.exit()
def main():
=== modified file 'bin/euca-reboot-instances'
--- bin/euca-reboot-instances 2010-02-16 19:56:56 +0000
+++ bin/euca-reboot-instances 2010-02-16 20:46:57 +0000
@@ -47,14 +47,13 @@
"""
-version_string = """ euca-reboot-instances version: 1.0 (BSD)"""
def usage():
print usage_string
Util().usage()
def version():
- print version_string
+ print Util().version()
sys.exit()
def main():
=== modified file 'bin/euca-register'
--- bin/euca-register 2010-02-16 19:56:56 +0000
+++ bin/euca-register 2010-02-16 20:46:57 +0000
@@ -48,14 +48,13 @@
"""
-version_string = """ euca-register version: 1.0 (BSD)"""
def usage():
print usage_string
Util().usage()
def version():
- print version_string
+ print Util().version()
sys.exit()
def main():
=== modified file 'bin/euca-release-address'
--- bin/euca-release-address 2010-02-16 19:56:56 +0000
+++ bin/euca-release-address 2010-02-16 20:46:57 +0000
@@ -48,14 +48,13 @@
"""
-version_string = """ euca-release-address version: 1.0 (BSD)"""
def usage():
print usage_string
Util().usage()
def version():
- print version_string
+ print Util().version()
sys.exit()
def main():
=== modified file 'bin/euca-reset-image-attribute'
--- bin/euca-reset-image-attribute 2010-02-16 19:56:56 +0000
+++ bin/euca-reset-image-attribute 2010-02-16 20:46:57 +0000
@@ -51,14 +51,13 @@
"""
-version_string = """ euca-reset-image-attribute version: 1.0 (BSD)"""
def usage():
print usage_string
Util().usage()
def version():
- print version_string
+ print Util().version()
sys.exit()
def main():
=== modified file 'bin/euca-revoke'
--- bin/euca-revoke 2010-02-16 19:56:56 +0000
+++ bin/euca-revoke 2010-02-16 20:46:57 +0000
@@ -63,14 +63,13 @@
"""
-version_string = """ euca-revoke version: 1.0 (BSD)"""
def usage():
print usage_string
Util().usage(compat=True)
def version():
- print version_string
+ print Util().version()
sys.exit()
def main():
=== modified file 'bin/euca-run-instances'
--- bin/euca-run-instances 2010-02-16 19:56:56 +0000
+++ bin/euca-run-instances 2010-02-16 20:46:57 +0000
@@ -70,14 +70,13 @@
"""
-version_string = """ euca-run-instances version: 1.0 (BSD)"""
def usage():
print usage_string
Util().usage()
def version():
- print version_string
+ print Util().version()
sys.exit()
def display_reservations(reservation):
=== modified file 'bin/euca-terminate-instances'
--- bin/euca-terminate-instances 2010-02-16 19:56:56 +0000
+++ bin/euca-terminate-instances 2010-02-16 20:46:57 +0000
@@ -49,14 +49,13 @@
"""
-version_string = """ euca-terminate-instances version: 1.0 (BSD)"""
def usage():
print usage_string
Util().usage()
def version():
- print version_string
+ print Util().version()
sys.exit()
def display_instances(instances, instance_ids):
=== modified file 'bin/euca-unbundle'
--- bin/euca-unbundle 2009-11-28 05:53:18 +0000
+++ bin/euca-unbundle 2010-02-16 20:46:57 +0000
@@ -65,7 +65,6 @@
"""
-version_string = """ euca-unbundle-image version: 1.0 (BSD)"""
IMAGE_IO_CHUNK = 8 * 1024
IMAGE_SPLIT_CHUNK = IMAGE_IO_CHUNK * 1024;
@@ -75,7 +74,7 @@
Util().usage()
def version():
- print version_string
+ print Util().version()
sys.exit()
def main():
=== modified file 'bin/euca-upload-bundle'
--- bin/euca-upload-bundle 2010-02-16 19:56:56 +0000
+++ bin/euca-upload-bundle 2010-02-16 20:46:57 +0000
@@ -66,14 +66,13 @@
"""
-version_string = """ euca-upload-bundle version: 1.0 (BSD)"""
def usage():
print usage_string
Util().usage()
def version():
- print version_string
+ print Util().version()
sys.exit()
def create_bucket(connection, bucket, canned_acl=None):
=== modified file 'bin/euca-version'
--- bin/euca-version 2009-08-01 15:30:33 +0000
+++ bin/euca-version 2010-02-16 20:46:57 +0000
@@ -36,7 +36,7 @@
from euca2ools import Euca2ool, Util
-TOOLS_VERSION = "1.0-31337"
+TOOLS_VERSION = "1.2-31337"
API_VERSION = "2009-04-04"
usage_string = """
@@ -45,14 +45,13 @@
euca-version [-h, --help] [--debug]
"""
-version_string = """ euca-version version: 1.0 (BSD)"""
def usage():
print usage_string
sys.exit()
def version():
- print version_string
+ print Util().version()
sys.exit()
def display_tools_version():
=== modified file 'euca2ools/euca2ools/__init__.py'
--- euca2ools/euca2ools/__init__.py 2010-02-16 19:56:56 +0000
+++ euca2ools/euca2ools/__init__.py 2010-02-16 22:10:32 +0000
@@ -48,7 +48,7 @@
import logging
BUNDLER_NAME = "euca-tools"
-BUNDLER_VERSION = "1.0"
+BUNDLER_VERSION = "1.2"
VERSION = "2007-10-10"
RELEASE = "31337"
AES = 'AES-128-CBC'
@@ -199,7 +199,12 @@
Euca2ools will use the environment variables EC2_URL, EC2_ACCESS_KEY, EC2_SECRET_KEY, EC2_CERT, EC2_PRIVATE_KEY, S3_URL, EUCALYPTUS_CERT by default.
"""
-
+
+ version_string = """ Version: 1.2 (BSD)"""
+
+ def version(self):
+ return self.version_string
+
def usage(self, compat=False):
if compat:
self.usage_string = self.usage_string.replace("-s,", "-S,")
euca2ools-1.2-bzr255-rcpath.patch:
__init__.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE euca2ools-1.2-bzr255-rcpath.patch ---
=== modified file 'euca2ools/euca2ools/__init__.py'
--- euca2ools/euca2ools/__init__.py 2010-02-17 18:04:05 +0000
+++ euca2ools/euca2ools/__init__.py 2010-02-19 21:03:55 +0000
@@ -346,7 +346,7 @@
self.environ = {}
user_eucarc = None
if 'HOME' in os.environ:
- os.path.join(os.getenv('HOME'), ".eucarc")
+ user_eucarc = os.path.join(os.getenv('HOME'), ".eucarc")
base_path = None
read_config = False
if self.config_file_path and os.path.exists(self.config_file_path):
euca2ools-1.2-bzr260-describe-order.patch:
euca-describe-images | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE euca2ools-1.2-bzr260-describe-order.patch ---
=== modified file 'bin/euca-describe-images'
--- bin/euca-describe-images 2010-02-16 20:46:57 +0000
+++ bin/euca-describe-images 2010-02-25 00:49:25 +0000
@@ -78,7 +78,7 @@
image_string += '\t%s' % ','.join(image.product_codes)
for i in [image.architecture, image.type,
- image.ramdisk_id, image.kernel_id]:
+ image.kernel_id, image.ramdisk_id]:
image_string += '\t%s' % ("" if i == None else i)
print 'IMAGE\t%s' % (image_string)
euca2ools-1.2-bzr267-path-processing.patch:
__init__.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE euca2ools-1.2-bzr267-path-processing.patch ---
=== modified file 'euca2ools/euca2ools/__init__.py'
--- euca2ools/euca2ools/__init__.py 2010-03-03 01:55:47 +0000
+++ euca2ools/euca2ools/__init__.py 2010-03-15 18:55:39 +0000
@@ -476,7 +476,7 @@
def get_file_path(self, filename):
relative_filename = self.get_relative_filename(filename)
- file_path = filename.replace(relative_filename, '')
+ file_path=os.path.dirname(filename)
if len(file_path) == 0:
file_path = "."
return file_path
euca2ools-1.2-bzr269-createvol-doc.patch:
bin/euca-create-volume | 2 +-
man/euca-create-volume.1 | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE euca2ools-1.2-bzr269-createvol-doc.patch ---
=== modified file 'bin/euca-create-volume'
--- bin/euca-create-volume 2010-02-26 15:33:49 +0000
+++ bin/euca-create-volume 2010-03-19 19:06:49 +0000
@@ -38,7 +38,7 @@
usage_string = """
Creates a volume in a specified availability zone.
-euca-create-volume -S, --size size | --snapshot snapshot_id -z zone
+euca-create-volume -s, --size size | --snapshot snapshot_id -z zone
[-h, --help] [--version] [--debug]
REQUIRED PARAMETERS
=== modified file 'man/euca-create-volume.1'
--- man/euca-create-volume.1 2010-03-10 20:11:59 +0000
+++ man/euca-create-volume.1 2010-03-19 19:06:49 +0000
@@ -5,7 +5,7 @@
.SH DESCRIPTION
Creates a volume in a specified availability zone.
.PP
-euca\-create\-volume \fB\-S\fR, \fB\-\-size\fR size | \fB\-\-snapshot\fR snapshot_id \fB\-z\fR zone
+euca\-create\-volume \fB\-s\fR, \fB\-\-size\fR size | \fB\-\-snapshot\fR snapshot_id \fB\-z\fR zone
[\-h, \fB\-\-help]\fR [\-\-version] [\-\-debug]
.PP
REQUIRED PARAMETERS
euca2ools-1.2-bzr271-imgattribute-doc.patch:
bin/euca-modify-image-attribute | 4 ++--
bin/euca-reset-image-attribute | 2 +-
man/euca-modify-image-attribute.1 | 4 ++--
man/euca-reset-image-attribute.1 | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
--- NEW FILE euca2ools-1.2-bzr271-imgattribute-doc.patch ---
=== modified file 'bin/euca-modify-image-attribute'
--- bin/euca-modify-image-attribute 2010-02-26 15:33:49 +0000
+++ bin/euca-modify-image-attribute 2010-03-21 17:17:30 +0000
@@ -48,9 +48,9 @@
OPTIONAL PARAMETERS
--l, --launch-permission Show launch permissions.
+-l, --launch-permission Launch permissions.
--p, --product-code Show the product codes associated with the image
+-p, --product-code Product codes associated with the image.
-a, -add Entity (typically, user id) to add.
=== modified file 'bin/euca-reset-image-attribute'
--- bin/euca-reset-image-attribute 2010-02-26 15:33:49 +0000
+++ bin/euca-reset-image-attribute 2010-03-21 17:17:30 +0000
@@ -43,7 +43,7 @@
REQUIRED PARAMETERS
--l, --launch-permission show launch permissions.
+-l, --launch-permission Launch permissions.
image_id - unique identifier for the image that you want to reset the attributes for.
=== modified file 'man/euca-modify-image-attribute.1'
--- man/euca-modify-image-attribute.1 2010-03-10 20:11:59 +0000
+++ man/euca-modify-image-attribute.1 2010-03-21 17:17:30 +0000
@@ -16,9 +16,9 @@
.PP
OPTIONAL PARAMETERS
.PP
-\fB\-l\fR, \fB\-\-launch\-permission\fR Show launch permissions.
+\fB\-l\fR, \fB\-\-launch\-permission\fR Launch permissions.
.PP
-\fB\-p\fR, \fB\-\-product\-code\fR Show the product codes associated with the image
+\fB\-p\fR, \fB\-\-product\-code\fR Product codes associated with the image
.PP
\fB\-a\fR, \fB\-add\fR Entity (typically, user id) to add.
.PP
=== modified file 'man/euca-reset-image-attribute.1'
--- man/euca-reset-image-attribute.1 2010-03-10 20:11:59 +0000
+++ man/euca-reset-image-attribute.1 2010-03-21 17:17:30 +0000
@@ -11,7 +11,7 @@
REQUIRED PARAMETERS
.PP
-\fB\-l\fR, \fB\-\-launch\-permission\fR show launch permissions.
+\fB\-l\fR, \fB\-\-launch\-permission\fR Launch permissions.
.PP
image_id \- unique identifier for the image that you want to reset the attributes for.
.PP
euca2ools-1.2-bzr273-blockdevmapping.patch:
euca-bundle-image | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE euca2ools-1.2-bzr273-blockdevmapping.patch ---
=== modified file 'bin/euca-bundle-image'
--- bin/euca-bundle-image 2010-02-26 15:33:49 +0000
+++ bin/euca-bundle-image 2010-03-23 01:12:51 +0000
@@ -83,9 +83,9 @@
print Util().version()
sys.exit()
-def get_block_devs(mapping):
+def get_block_devs(mapping_str):
mapping = []
- mapping_pairs = mapping.split(',')
+ mapping_pairs = mapping_str.split(',')
for m in mapping_pairs:
m_parts = m.split('=')
if(len(m_parts) > 1):
Index: euca2ools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/euca2ools/devel/euca2ools.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- euca2ools.spec 18 Feb 2010 20:55:19 -0000 1.3
+++ euca2ools.spec 23 Mar 2010 03:57:27 -0000 1.4
@@ -2,7 +2,7 @@
Name: euca2ools
Version: 1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Elastic Utility Computing Architecture Command-Line Tools
Group: Applications/Internet
@@ -19,6 +19,38 @@ BuildRequires: python-setuptools-devel
BuildArch: noarch
+# Fix bad version reporting
+# https://launchpad.net/bugs/522396
+# Upstream bzr251-252
+Patch251: euca2ools-1.2-bzr251_252-versionstr.patch
+
+# Fix broken rc file searching
+# https://launchpad.net/bugs/516738
+# https://launchpad.net/bugs/524652
+Patch255: euca2ools-1.2-bzr255-rcpath.patch
+
+# Fix reversed kernel+ramdisk display order in euca-describe-images
+# https://launchpad.net/bugs/526697
+Patch260: euca2ools-1.2-bzr260-describe-order.patch
+
+# Fix broken file path processing
+# https://launchpad.net/bugs/522060
+Patch267: euca2ools-1.2-bzr267-path-processing.patch
+
+# Make euca-create-volume documentation consistent
+# https://launchpad.net/bugs/542097
+Patch269: euca2ools-1.2-bzr269-createvol-doc.patch
+
+# Correct help files for euca-{modify,reset}-image-attribute
+# https://launchpad.net/bugs/543559
+# Adapted from upstream bzr271
+Patch271: euca2ools-1.2-bzr271-imgattribute-doc.patch
+
+# Fix euca-bundle-image --block-device-mapping
+# https://bugzilla.redhat.com/show_bug.cgi?id=575166
+# https://launchpad.net/bugs/544706
+Patch273: euca2ools-1.2-bzr273-blockdevmapping.patch
+
%description
Eucalyptus is an open source service overlay that implements elastic
computing using existing resources. The goal of Eucalyptus is to allow
@@ -32,6 +64,13 @@ Eucalyptus. These tools are also compat
%prep
%setup -q
+%patch251 -p0
+%patch255 -p0
+%patch260 -p0
+%patch267 -p0
+%patch269 -p0
+%patch271 -p0
+%patch273 -p0
%build
@@ -67,6 +106,15 @@ rm -rf %{buildroot}
%doc README
%changelog
+* Mon Mar 22 2010 Garrett Holmstrom <gholms at fedoraproject.org> - 1.2-2
+- Fix bad version reporting [LP:522396]
+- Fix broken rc file searching [LP:516738 LP:524652]
+- Fix reversed kernel+ramdisk display order in euca-describe-images [LP:256697]
+- Fix broken file patch processing [LP:522060]
+- Make euca-create-volume documentation consistent [LP:542097]
+- Correct help files for euca-{modify,reset}-image-attribute [LP:543559]
+- Fix euca-bundle-image --block-device-mapping [575166]
+
* Thu Feb 18 2010 Garrett Holmstrom <gholms at fedoraproject.org> - 1.2-1
- Upstream update
@@ -75,7 +123,7 @@ rm -rf %{buildroot}
* Wed Jan 20 2010 Garrett Holmstrom <gholms at fedoraproject.org> - 1.1-4
- Stop requiring swig
-- Take ownership of %%{python_sitelib}/%{name} directory
+- Take ownership of %%{python_sitelib}/%%{name} directory
- Clarify description
- Drop now-superfluous buildroot tag and cleaning step
- Previous message: File euca2ools-1.2-bzr273-blockdevmapping.patch uploaded to lookaside cache by gholms
- Next message: rpms/euca2ools/F-12 euca2ools-1.2-bzr251_252-versionstr.patch, NONE, 1.1 euca2ools-1.2-bzr255-rcpath.patch, NONE, 1.1 euca2ools-1.2-bzr260-describe-order.patch, NONE, 1.1 euca2ools-1.2-bzr267-path-processing.patch, NONE, 1.1 euca2ools-1.2-bzr269-createvol-doc.patch, NONE, 1.1 euca2ools-1.2-bzr271-imgattribute-doc.patch, NONE, 1.1 euca2ools-1.2-bzr273-blockdevmapping.patch, NONE, 1.1 euca2ools.spec, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list