[euca2ools] Fix euca-describe-image-attribute -B output [LP:795395]

[gholms]

commit f97663947fae749f75384ee7b9ae2c57330b851b
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Fri Jun 10 10:30:39 2011 -0700

    Fix euca-describe-image-attribute -B output [LP:795395]

 euca2ools-1.3.1-imageattr-ptr.patch |   14 ++++++++++++++
 euca2ools.spec                      |    4 ++++
 2 files changed, 18 insertions(+), 0 deletions(-)
---
diff --git a/euca2ools-1.3.1-imageattr-ptr.patch b/euca2ools-1.3.1-imageattr-ptr.patch
new file mode 100644
index 0000000..a848a07
--- /dev/null
+++ b/euca2ools-1.3.1-imageattr-ptr.patch
@@ -0,0 +1,14 @@
+Index: euca2ools-1.3/bin/euca-describe-image-attribute
+===================================================================
+--- euca2ools-1.3.orig/bin/euca-describe-image-attribute
++++ euca2ools-1.3/bin/euca-describe-image-attribute
+@@ -98,7 +98,8 @@ def display_image_attribute(image_id, im
+         for dev_name in block_device_mapping:
+             print 'blockDeviceMapping\t%s\tblockDeviceMap\t%s: %s' \
+                 % (image_id, dev_name,
+-                   block_device_mapping[dev_name])
++                   (block_device_mapping[dev_name].ephemeral_name or
++                    block_device_mapping[dev_name].snapshot_id))
+ 
+ def main():
+     euca = None
diff --git a/euca2ools.spec b/euca2ools.spec
index 1e9afd2..21e0484 100644
--- a/euca2ools.spec
+++ b/euca2ools.spec
@@ -60,6 +60,8 @@ Patch22:        euca2ools-1.3.1-smallbundle.patch
 Patch23:        euca2ools-1.3.1-mkfsopt.patch
 # (upstream bzr revision 424)
 Patch24:        euca2ools-1.3.1-emptyblock.patch
+# https://bugs.launchpad.net/euca2ools/+bug/795395
+Patch25:        euca2ools-1.3.1-imageattr-ptr.patch
 
 Requires:       m2crypto
 Requires:       python-boto
@@ -109,6 +111,7 @@ Eucalyptus.  These tools are also compatible with Amazon AWS.
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
+%patch25 -p1
 
 
 %build
@@ -146,6 +149,7 @@ rm -rf %{buildroot}
 %changelog
 * Fri Jun 10 2011 Garrett Holmstrom <gholms at fedoraproject.org> - 1.3.1-11
 - Fixed handling of empty block device sizes
+- Fixed euca-describe-image-attribute -B output [LP:795395]
 
 * Tue Apr 26 2011 Garrett Holmstrom <gholms at fedoraproject.org> - 1.3.1-10
 - Added unlisted dependencies for euca-bundle-vol