[heat] Added patch file missed in previous commit

Steven Dake sdake at fedoraproject.org
Wed Sep 26 15:29:40 UTC 2012


commit 704c4edbd6b1c0cec06d2f44624da9318ea8b381
Author: Steven Dake <sdake at redhat.com>
Date:   Wed Sep 26 08:29:08 2012 -0700

    Added patch file missed in previous commit
    
    Signed-off-by: Steven Dake <sdake at redhat.com>

 heat-fix-glanceclient-deprecation-warning.patch |   53 +++++++++++++++++++++++
 1 files changed, 53 insertions(+), 0 deletions(-)
---
diff --git a/heat-fix-glanceclient-deprecation-warning.patch b/heat-fix-glanceclient-deprecation-warning.patch
new file mode 100644
index 0000000..03d3f12
--- /dev/null
+++ b/heat-fix-glanceclient-deprecation-warning.patch
@@ -0,0 +1,53 @@
+From d9f63269f1a0205811cd84487787c8c1291a952b Mon Sep 17 00:00:00 2001
+From: Steven Hardy <shardy at redhat.com>
+Date: Wed, 26 Sep 2012 14:51:08 +0100
+Subject: [PATCH] heat : fix glanceclient deprecation warning
+
+glanceclient module name changed for F18, so do
+a conditional import which should import the correct
+version provided one is available (tested on F17/F18)
+
+Fixes #251
+
+Change-Id: I095560f29a408949a7d54795fc000c094b1d63b9
+Signed-off-by: Steven Hardy <shardy at redhat.com>
+---
+ heat/tests/functional/util.py | 5 ++++-
+ heat/utils.py                 | 5 ++++-
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/heat/tests/functional/util.py b/heat/tests/functional/util.py
+index b9f6e06..bb88ec1 100644
+--- a/heat/tests/functional/util.py
++++ b/heat/tests/functional/util.py
+@@ -33,7 +33,10 @@ from nose.plugins.attrib import attr
+ from nose import with_setup
+ from nose.exc import SkipTest
+ 
+-from glance import client as glance_client
++try:
++    from glanceclient import client as glance_client
++except ImportError:
++    from glance import client as glance_client
+ from novaclient.v1_1 import client as nova_client
+ import heat
+ from heat import utils
+diff --git a/heat/utils.py b/heat/utils.py
+index 528b40d..bc39b6c 100644
+--- a/heat/utils.py
++++ b/heat/utils.py
+@@ -21,7 +21,10 @@ import base64
+ from lxml import etree
+ import re
+ 
+-from glance import client as glance_client
++try:
++    from glanceclient import client as glance_client
++except ImportError:
++    from glance import client as glance_client
+ from heat.common import exception
+ 
+ from heat.openstack.common import log as logging
+-- 
+1.7.11.4
+


More information about the scm-commits mailing list