[Pkg-libvirt-commits] [libguestfs] 102/233: daemon: lvm2: Ignore "unknown device" output when a PV is missing (RHBZ#1054761).

[Hilko Bengen]

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

bengen pushed a commit to branch experimental
in repository libguestfs.

commit aa2ca8ba703254267939dfcd8d276cbd6f651858
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Wed Jan 22 17:10:09 2014 +0000

    daemon: lvm2: Ignore "unknown device" output when a PV is missing (RHBZ#1054761).
---
 daemon/lvm.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/daemon/lvm.c b/daemon/lvm.c
index 19122c5..a615a14 100644
--- a/daemon/lvm.c
+++ b/daemon/lvm.c
@@ -81,9 +81,12 @@ convert_lvm_output (char *out, const char *prefix)
     } else
       str = p;
 
-    if (add_string (&ret, str) == -1) {
-      free (out);
-      return NULL;
+    /* Ignore "unknown device" message (RHBZ#1054761). */
+    if (STRNEQ (str, "unknown device")) {
+      if (add_string (&ret, str) == -1) {
+        free (out);
+        return NULL;
+      }
     }
 
     p = pend;

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