[euca2ools] Fix bundling failure on small images [LP:760157]

[gholms]

commit d5300c59325eaf4055042235dca09a10b189f174
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Wed May 4 20:07:34 2011 -0700

    Fix bundling failure on small images [LP:760157]

 euca2ools-1.3.1-smallbundle.patch |   17 +++++++++++++++++
 euca2ools.spec                    |    4 ++++
 2 files changed, 21 insertions(+), 0 deletions(-)
---
diff --git a/euca2ools-1.3.1-smallbundle.patch b/euca2ools-1.3.1-smallbundle.patch
new file mode 100644
index 0000000..e21e4ea
--- /dev/null
+++ b/euca2ools-1.3.1-smallbundle.patch
@@ -0,0 +1,17 @@
+--- euca2ools-1.3.1/euca2ools/euca2ools/__init__.py.smallbundle	2011-04-26 14:20:23.563605281 -0700
++++ euca2ools-1.3.1/euca2ools/euca2ools/__init__.py	2011-04-26 14:23:58.721153869 -0700
+@@ -779,6 +779,14 @@ class Euca2ool:
+ 
+         zipproc.stdin.close();
+         targzfile.close()
++
++        tarproc.wait()
++        zipproc.wait()
++        for p, pname in [(tarproc, 'tar'), (zipproc, 'gzip')]:
++            if p.returncode != 0:
++                print "'%s' returned error (%i)" % (pname, p.returncode)
++                raise CommandFailed
++
+         if os.path.getsize(targz) <= 0:
+             print 'Could not tar/compress image'
+             raise CommandFailed
diff --git a/euca2ools.spec b/euca2ools.spec
index e346467..44bcbdf 100644
--- a/euca2ools.spec
+++ b/euca2ools.spec
@@ -52,6 +52,8 @@ Patch19:        euca2ools-1.3.1-srcnet.patch
 Patch20:        euca2ools-1.3.1-boto20.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=684976
 Patch21:        euca2ools-1.3.1-euca20.patch
+# https://bugs.launchpad.net/euca2ools/+bug/760157
+Patch22:        euca2ools-1.3.1-smallbundle.patch
 
 Requires:       m2crypto
 Requires:       python-boto
@@ -98,6 +100,7 @@ Eucalyptus.  These tools are also compatible with Amazon AWS.
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
 
 
 %build
@@ -136,6 +139,7 @@ rm -rf %{buildroot}
 * Tue Apr 26 2011 Garrett Holmstrom <gholms at fedoraproject.org> - 1.3.1-10
 - Added unlisted dependencies for euca-bundle-vol
 - Fixed typos introduced by the FSID patch
+- Fixed bundling failure on small images [LP:760157]
 
 * Tue Mar 22 2011 Garrett Holmstrom <gholms at fedoraproject.org> - 1.3.1-9
 - Work around Boto 2.0 + Eucalyptus 2.0 incompatibility [RH:684976]