[python26-boto/el5: 10/21] Update to 2.9.6 and temporarily add _virtualization_type for rel-eng
gholms
gholms at fedoraproject.org
Mon Feb 10 23:19:56 UTC 2014
commit e068e65c2084156e84136730255ea7b7ff4edbd8
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date: Fri Jun 21 15:06:59 2013 -0700
Update to 2.9.6 and temporarily add _virtualization_type for rel-eng
.gitignore | 1 +
boto-2.9.6-adjtype.patch | 27 +++++++++++++++++++++++++++
boto-2.9.6-virttype.patch | 23 +++++++++++++++++++++++
python-boto.spec | 13 ++++++++++++-
sources | 2 +-
5 files changed, 64 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 381b457..ca8b649 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/boto-2.5.2.tar.gz
/boto-2.6.0.tar.gz
/boto-2.9.2.tar.gz
+/boto-2.9.6.tar.gz
diff --git a/boto-2.9.6-adjtype.patch b/boto-2.9.6-adjtype.patch
new file mode 100644
index 0000000..61f79f3
--- /dev/null
+++ b/boto-2.9.6-adjtype.patch
@@ -0,0 +1,27 @@
+Index: boto-2.9.6/boto/ec2/autoscale/policy.py
+===================================================================
+--- boto-2.9.6.orig/boto/ec2/autoscale/policy.py
++++ boto-2.9.6/boto/ec2/autoscale/policy.py
+@@ -47,17 +47,17 @@ class Alarm(object):
+ class AdjustmentType(object):
+ def __init__(self, connection=None):
+ self.connection = connection
+- self.adjustment_types = ListElement([])
++ self.adjustment_type = None
+
+ def __repr__(self):
+- return 'AdjustmentType:%s' % self.adjustment_types
++ return 'AdjustmentType:%s' % self.adjustment_type
+
+ def startElement(self, name, attrs, connection):
+- if name == 'AdjustmentType':
+- return self.adjustment_types
++ return
+
+ def endElement(self, name, value, connection):
+- return
++ if name == 'AdjustmentType':
++ return self.adjustment_types
+
+
+ class MetricCollectionTypes(object):
diff --git a/boto-2.9.6-virttype.patch b/boto-2.9.6-virttype.patch
new file mode 100644
index 0000000..a169bff
--- /dev/null
+++ b/boto-2.9.6-virttype.patch
@@ -0,0 +1,23 @@
+Index: boto-2.9.6/boto/ec2/connection.py
+===================================================================
+--- boto-2.9.6.orig/boto/ec2/connection.py
++++ boto-2.9.6/boto/ec2/connection.py
+@@ -235,7 +235,8 @@ class EC2Connection(AWSQueryConnection):
+
+ def register_image(self, name=None, description=None, image_location=None,
+ architecture=None, kernel_id=None, ramdisk_id=None,
+- root_device_name=None, block_device_map=None):
++ root_device_name=None, block_device_map=None,
++ _virtualization_type=None):
+ """
+ Register an image.
+
+@@ -283,6 +284,8 @@ class EC2Connection(AWSQueryConnection):
+ params['ImageLocation'] = image_location
+ if root_device_name:
+ params['RootDeviceName'] = root_device_name
++ if _virtualization_type:
++ params['VirtualizationType'] = _virtualization_type
+ if block_device_map:
+ block_device_map.build_list_params(params)
+ rs = self.get_object('RegisterImage', params, ResultSet, verb='POST')
diff --git a/python-boto.spec b/python-boto.spec
index 285ab7a..a38e547 100644
--- a/python-boto.spec
+++ b/python-boto.spec
@@ -1,7 +1,7 @@
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
Summary: A simple lightweight interface to Amazon Web Services
Name: python-boto
-Version: 2.9.2
+Version: 2.9.6
Release: 1%{?dist}
License: MIT
Group: Development/Languages
@@ -11,6 +11,11 @@ BuildRequires: python-devel >= 2.5, python-setuptools-devel
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# https://github.com/boto/boto/pull/1538
+Patch1: boto-2.9.6-adjtype.patch
+# Needed for euca-register --virtualization-type, requested by rel-eng
+Patch2: boto-2.9.6-virttype.patch
+
%description
Boto is a Python package that provides interfaces to Amazon Web Services.
It supports S3 (Simple Storage Service), SQS (Simple Queue Service) via
@@ -20,6 +25,8 @@ use, lightweight wrapper around the Amazon services.
%prep
%setup -q -n boto-%{version}
+%patch1 -p1
+%patch2 -p1
rm -r boto.egg-info
%build
@@ -54,6 +61,10 @@ rm -r boto.egg-info
%{python_sitelib}/boto*.egg-info
%changelog
+* Fri Jun 21 2013 Garrett Holmstrom <gholms at fedoraproject.org> - 2.9.6-1
+- Updated to 2.9.6
+- Fixed autoscaling policy parsing (boto #1538)
+
* Thu May 9 2013 Orion Poplawski <orion at cora.nwra.com> - 2.9.2-1
- Update to 2.9.2 (bug #948714)
- Spec cleanup
diff --git a/sources b/sources
index 8f682e0..ae7e8f4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-18fe51b8a8d8e42d831046da8cea5d4e boto-2.9.2.tar.gz
+46f8e51001d2e8e17ec50615d0d55201 boto-2.9.6.tar.gz
More information about the scm-commits
mailing list