[python-boto/el6] Actually add the emptydata patch this time :)

gholms gholms at fedoraproject.org
Fri Jul 6 20:01:15 UTC 2012


commit 4a825133853191c35c3b0300ec2092a1d063a770
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Fri Jul 6 13:00:21 2012 -0700

    Actually add the emptydata patch this time :)

 python-boto-2.5.2-emptydata.patch |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)
---
diff --git a/python-boto-2.5.2-emptydata.patch b/python-boto-2.5.2-emptydata.patch
new file mode 100644
index 0000000..948af03
--- /dev/null
+++ b/python-boto-2.5.2-emptydata.patch
@@ -0,0 +1,19 @@
+commit 6870daf7ef98579c73473fb8b8852abf6ce7f1f8
+Author: Neil Wilson <neil at aldur.co.uk>
+Date:   Wed Jul 4 16:58:53 2012 +0100
+
+    utils.py: Add guard for blank responses to get-instance-metadata
+
+diff --git a/boto/utils.py b/boto/utils.py
+index 860a26c..d71eb7a 100644
+--- a/boto/utils.py
++++ b/boto/utils.py
+@@ -251,7 +251,7 @@ class LazyLoadMetadata(dict):
+             val = boto.utils.retry_url(self._url + urllib.quote(resource,
+                                                                 safe="/:"),
+                                        num_retries=self._num_retries)
+-            if val[0] == '{':
++            if val and val[0] == '{':
+                 val = json.loads(val)
+             else:
+                 p = val.find('\n')


More information about the scm-commits mailing list