[yum-commits] 3 commits - debuginfo-install.py plugins/fs-snapshot yum-utils.bash

[zpavlas at osuosl.org]

 debuginfo-install.py               |    6 +++++-
 plugins/fs-snapshot/fs-snapshot.py |    7 ++++---
 yum-utils.bash                     |    3 +++
 3 files changed, 12 insertions(+), 4 deletions(-)

New commits:
commit 0c0ddb41f347e9cdf9d3ea124fd87fd28b093a16
Author: Zdenek Pavlas <zpavlas at redhat.com>
Date:   Mon Apr 29 12:24:27 2013 +0200

    fs-snapshot: "dmsetup -o" workaround.  BZ 954358

diff --git a/plugins/fs-snapshot/fs-snapshot.py b/plugins/fs-snapshot/fs-snapshot.py
index 8099b19..4f99b6a 100644
--- a/plugins/fs-snapshot/fs-snapshot.py
+++ b/plugins/fs-snapshot/fs-snapshot.py
@@ -82,14 +82,15 @@ def inspect_volume_lvm(conduit, volume):
     if device.startswith("/dev/mapper/"):
         # convert /dev/mapper name to /dev/vg/lv for use with LVM2 tools
         # - 'dmsetup splitname' will collapse any escaped characters
-        p = Popen(["/sbin/dmsetup", "splitname", "--separator", "/",
+        p = Popen(["/sbin/dmsetup", "splitname", "--separator", " ",
                    "--noheadings", "-c",
-                   "-o", "vg_name,lv_name", device], stdout=PIPE, stderr=PIPE)
+                   device], stdout=PIPE, stderr=PIPE)
         err = p.wait()
         if err:
             return 0
         output = p.communicate()[0]
-        device = output.strip().replace("/dev/mapper/", "/dev/")
+        device = "/".join(output.split()[:2])
+        device = device.replace("/dev/mapper/", "/dev/")
         volume["device"] = device
 
     # Check if device is managed by lvm
commit 5b1c7b1d667d1d3b3ff489594a28111fc152e3a4
Author: Zdenek Pavlas <zpavlas at redhat.com>
Date:   Thu Apr 25 15:01:20 2013 +0200

    debuginfo-install: handle YumBaseError

diff --git a/debuginfo-install.py b/debuginfo-install.py
index 5c1f77d..be2ff2d 100755
--- a/debuginfo-install.py
+++ b/debuginfo-install.py
@@ -53,7 +53,11 @@ class DebugInfoInstall(YumUtilBase):
                         help="Turn off automatic installation/update of the yum debuginfo plugin")
 
         self.done = set()
-        self.main()
+        try:
+            self.main()
+        except yum.Errors.YumBaseError, e:
+            print e
+            sys.exit(1)
 
     def doUtilConfigSetup(self, *args, **kwargs):
         """ We override this to get our extra option out. """
commit ea535a598329a82f821361147c573dd281223cc9
Author: Zdenek Pavlas <zpavlas at redhat.com>
Date:   Thu Apr 18 10:04:56 2013 +0200

    bash completion: load yum.bash in. BZ 953210

diff --git a/yum-utils.bash b/yum-utils.bash
index 20e8e5c..6578bb3 100644
--- a/yum-utils.bash
+++ b/yum-utils.bash
@@ -1,3 +1,6 @@
+# need functions from yum.bash
+type -t _yum >/dev/null || . $(pkg-config --variable=completionsdir bash-completion)/yum
+
 # bash completion for yum-utils
 
 _yu_init_completion()