[openstack-nova] Updated patches from master-patches

[Pádraig Brady]

commit 161a743b2e8b324c4bae81339bcf5c3062f09815
Author: Pádraig Brady <P at draigBrady.com>
Date:   Mon Jan 30 13:21:02 2012 +0000

    Updated patches from master-patches
    
    - Suppress a warning from `nova-manage image convert`

 ...e-don-t-access-the-net-when-building-docs.patch |    2 +-
 0002-fix-nova-manage-image-convert-exception.patch |   27 ++++++++++++++++++++
 openstack-nova.spec                                |    7 ++++-
 3 files changed, 34 insertions(+), 2 deletions(-)
---
diff --git a/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch b/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
index 7a175b1..4d6dd3e 100644
--- a/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
+++ b/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
@@ -1,4 +1,4 @@
-From 3588ad017f290892ddbf56a124926076edee4e79 Mon Sep 17 00:00:00 2001
+From 001a6b44c152b2594b79ea005c2afba41be4054a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
 Date: Fri, 6 Jan 2012 12:16:34 +0000
 Subject: [PATCH] Ensure we don't access the net when building docs
diff --git a/0002-fix-nova-manage-image-convert-exception.patch b/0002-fix-nova-manage-image-convert-exception.patch
new file mode 100644
index 0000000..4dca60b
--- /dev/null
+++ b/0002-fix-nova-manage-image-convert-exception.patch
@@ -0,0 +1,27 @@
+From 126e601e2276025f9a42ca83cb3f026665b235e9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
+Date: Fri, 27 Jan 2012 17:58:17 +0000
+Subject: [PATCH] fix `nova-manage image convert` exception
+
+* bin/nova-manage (_convert_images): Don't convert
+the image id to a number as it's now a uuid.
+
+Change-Id: I4dfe5693d8f394fb9ee3f2c18c7e0b3f2524e931
+---
+ bin/nova-manage |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/bin/nova-manage b/bin/nova-manage
+index 88b15d2..3fb9903 100755
+--- a/bin/nova-manage
++++ b/bin/nova-manage
+@@ -1965,8 +1965,7 @@ class ImageCommands(object):
+                 with open(image_path) as ifile:
+                     image = self.image_service.create(elevated, meta, ifile)
+                 new = image['id']
+-                print _("Image %(old)s converted to " \
+-                        "%(new)s (%(new)08x).") % locals()
++                print _("Image %(old)s converted to %(new)s.") % locals()
+             except Exception as exc:
+                 print _("Failed to convert %(old)s: %(exc)s") % locals()
+ 
diff --git a/openstack-nova.spec b/openstack-nova.spec
index 98959bb..33169c6 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -5,7 +5,7 @@ Version:          2012.1
 # The Release is in form 0.X.tag as per:
 #   http://fedoraproject.org/wiki/Packaging:NamingGuidelines#Pre-Release_packages
 # So for prereleases always increment X
-Release:          0.2.e3%{?dist}
+Release:          0.3.e3%{?dist}
 Summary:          OpenStack Compute (nova)
 
 Group:            Applications/System
@@ -34,6 +34,7 @@ Source23:         openstack-nova-db-setup
 # patches_base=essex-3
 #
 Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
+Patch0002: 0002-fix-nova-manage-image-convert-exception.patch
 
 BuildArch:        noarch
 BuildRequires:    intltool
@@ -167,6 +168,7 @@ This package contains documentation files for nova.
 %setup -q -n nova-%{version}
 
 %patch0001 -p1
+%patch0002 -p1
 
 find . \( -name .gitignore -o -name .placeholder \) -delete
 
@@ -354,6 +356,9 @@ fi
 %endif
 
 %changelog
+* Mon Jan 30 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-0.3.e3
+- Suppress a warning from `nova-manage image convert`
+
 * Fri Jan 27 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-0.2.e3
 - Suppress erroneous output to stdout on package install (#785115)
 - Specify a connection_type in nova.conf, needed by essex-3