[pkg-eucalyptus-commits] [euca2ools] 31/41: Fix bundlevol <-> imagecreator arg mismatch

[Charles Plessy]

This is an automated email from the git hooks/post-receive script.

plessy pushed a commit to branch master
in repository euca2ools.

commit ed969afd0293e8fb5885dedeee626c954f630531
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Mon Sep 9 17:20:08 2013 -0700

    Fix bundlevol <-> imagecreator arg mismatch
    
    Fixes TOOLS-381
---
 euca2ools/commands/bundle/imagecreator.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/euca2ools/commands/bundle/imagecreator.py b/euca2ools/commands/bundle/imagecreator.py
index ba3fcf9..f9a6629 100644
--- a/euca2ools/commands/bundle/imagecreator.py
+++ b/euca2ools/commands/bundle/imagecreator.py
@@ -36,7 +36,9 @@ import time
 
 
 NO_EXCLUDE_ENVAR = 'EUCA_BUNDLE_VOL_EMPTY_EXCLUDES'
-BLKID_TAGS = ('LABEL', 'TYPE', 'UUID')
+BLKID_TAGS = {'LABEL': 'label',
+              'TYPE': 'fstype',
+              'UUID': 'uuid'}
 ALLOWED_FS_TYPES = ('ext2', 'ext3', 'ext4', 'xfs', 'jfs', 'reiserfs')
 EXCLUDED_DIRS = ('/dev', '/media', '/mnt', '/proc',
                  '/sys', '/cdrom', '/tmp')
@@ -389,7 +391,7 @@ class ImageCreator(object):
                                             '-ovalue', devnode],
                                            stdout=subprocess.PIPE
                                            ).communicate()[0]
-                    self.filesystem[tag.lower()] = out.rstrip()
+                    self.filesystem[BLKID_TAGS[tag]] = out.rstrip()
                 except subprocess.CalledProcessError:
                     pass
         finally:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-eucalyptus/euca2ools.git