[euca2ools] Fix typos introduced by the FSID patch

[gholms]

commit 71bdb39cd488ca160a59749a16b8ecdb2835aa48
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Wed May 4 20:04:00 2011 -0700

    Fix typos introduced by the FSID patch

 euca2ools-1.3.1-fsid.patch |   18 +++++++++++-------
 euca2ools.spec             |    1 +
 2 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/euca2ools-1.3.1-fsid.patch b/euca2ools-1.3.1-fsid.patch
index 41be8e8..3df7966 100644
--- a/euca2ools-1.3.1-fsid.patch
+++ b/euca2ools-1.3.1-fsid.patch
@@ -1,5 +1,7 @@
---- euca2ools-1.3.1/bin/euca-bundle-vol.fsid	2011-02-17 19:05:37.148478765 -0800
-+++ euca2ools-1.3.1/bin/euca-bundle-vol	2011-02-17 19:23:42.916491932 -0800
+Index: euca2ools-1.3/bin/euca-bundle-vol
+===================================================================
+--- euca2ools-1.3.orig/bin/euca-bundle-vol
++++ euca2ools-1.3/bin/euca-bundle-vol
 @@ -41,6 +41,8 @@ from euca2ools import Euca2ool, FileVali
      NotFoundError, CommandFailed, UnsupportedException
  from subprocess import *
@@ -66,8 +68,10 @@
          except NotFoundError:
              sys.exit(1)
          except UnsupportedException:
---- euca2ools-1.3.1/euca2ools/euca2ools/__init__.py.fsid	2011-02-17 19:05:37.143479037 -0800
-+++ euca2ools-1.3.1/euca2ools/euca2ools/__init__.py	2011-02-17 19:45:06.945327441 -0800
+Index: euca2ools-1.3/euca2ools/euca2ools/__init__.py
+===================================================================
+--- euca2ools-1.3.orig/euca2ools/euca2ools/__init__.py
++++ euca2ools-1.3/euca2ools/euca2ools/__init__.py
 @@ -213,13 +213,40 @@ devpts          /dev/pts      devpts   g
              print 'Creating disk image...', image_path
          Popen(dd_cmd, PIPE).communicate()[0]
@@ -110,7 +114,7 @@
 +
 +        if len(tunecmd):
 +            Util().check_prerequisite_command(tunecmd[0])
-+            tune_cmd = Popen(tunecmd,PIPE).communicate[0]
++            tune_cmd = Popen(tunecmd,PIPE).communicate()[0]
  
      def add_fstab(
          self,
@@ -119,7 +123,7 @@
          raise UnsupportedException
  
 -    def make_fs(self, image_path):
-+    def make_fs(self, image_path, fstype = None, uuid = None, label = None):
++    def make_fs(self, image_path, fs_type = None, uuid = None, label = None):
          print 'Sorry. Solaris not supported yet'
          raise UnsupportedException
  
@@ -150,7 +154,7 @@
              raise UnsupportedException
          self.img.create_image(size_in_MB, image_path)
 -        self.img.make_fs(image_path)
-+        self.img.make_fs(image_path, fs_type=fstype, uuid=uuid, label=label)
++        self.img.make_fs(image_path, fs_type=fs_type, uuid=uuid, label=label)
          return image_path
  
      def create_loopback(self, image_path):
diff --git a/euca2ools.spec b/euca2ools.spec
index 92531cf..e346467 100644
--- a/euca2ools.spec
+++ b/euca2ools.spec
@@ -135,6 +135,7 @@ rm -rf %{buildroot}
 %changelog
 * 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
 
 * 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]