[pkg-eucalyptus-commits] [euca2ools] 01/02: Fix blkid call on RHEL 6

[Charles Plessy]

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

plessy pushed a commit to annotated tag v3.1.1
in repository euca2ools.

commit 84e40725526690aa7c148ec0054d5e596189654d
Author: Garrett Holmstrom <gholms at devzero.com>
Date:   Fri Oct 10 14:52:06 2014 -0700

    Fix blkid call on RHEL 6
    
    RHEL 6's version of util-linux lacks support for blkid's -d option.
    This commit fixes euca-bundle-vol there by simply making it not use that
    option.  It also raises an exception when that command fails.
    
    Fixes TOOLS-520
---
 euca2ools/commands/bundle/bundlevolume.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/euca2ools/commands/bundle/bundlevolume.py b/euca2ools/commands/bundle/bundlevolume.py
index 3116a5d..3e3beb8 100644
--- a/euca2ools/commands/bundle/bundlevolume.py
+++ b/euca2ools/commands/bundle/bundlevolume.py
@@ -481,7 +481,7 @@ def _get_all_mounts():
 
 
 def _get_filesystem_info(device):
-    blkid = subprocess.Popen(['blkid', '-d', '-o', 'export', device],
+    blkid = subprocess.Popen(['blkid', '-o', 'export', device],
                              stdout=subprocess.PIPE)
     fsinfo = {}
     for line in blkid.stdout:
@@ -493,6 +493,8 @@ def _get_filesystem_info(device):
         elif key == 'UUID':
             fsinfo['uuid'] = val
     blkid.wait()
+    if blkid.returncode != 0:
+        raise subprocess.CalledProcessError(blkid.returncode, 'blkid')
     return fsinfo
 
 

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