[Pkg-libvirt-commits] [SCM] Libguestfs Debian packaging branch, master, updated. debian/1.0.84-3

[Guido Günther]

The following commit has been merged in the master branch:
commit ae3ee70c233ed3b20575c31d22deb3ce13abaae8
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sun Feb 21 19:31:04 2010 +0100

    New patch 0004-Disable-fuser-tests-if-dev-fuse-doesn-t-exist.patch
    
    Disable fuse tests if /dev/fuse doesn't exist

diff --git a/debian/patches/0004-Disable-fuser-tests-if-dev-fuse-doesn-t-exist.patch b/debian/patches/0004-Disable-fuser-tests-if-dev-fuse-doesn-t-exist.patch
new file mode 100644
index 0000000..fc5beab
--- /dev/null
+++ b/debian/patches/0004-Disable-fuser-tests-if-dev-fuse-doesn-t-exist.patch
@@ -0,0 +1,26 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Sun, 21 Feb 2010 19:29:30 +0100
+Subject: [PATCH] Disable fuser tests if /dev/fuse doesn't exist
+
+e.g. when running in a chroot.
+---
+ fuse/test-fuse.sh |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/fuse/test-fuse.sh b/fuse/test-fuse.sh
+index 2b4d0d7..b0b4a1e 100755
+--- a/fuse/test-fuse.sh
++++ b/fuse/test-fuse.sh
+@@ -45,6 +45,11 @@ if [ ! -x "$guestfish" -o ! -x "$guestmount" ]; then
+     exit 1
+ fi
+ 
++if [ ! -c /dev/fuser ]; then
++    echo "/dev/fuse does not exist skipping tests."
++    exit 0
++fi
++
+ # Ensure everything is cleaned up on exit.
+ rm -f "$image"
+ mkdir -p "$mp"
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index b22b99d..a090e91 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Run-debirf-as-root.patch
 0002-scrub-now-available-on-Debian.patch
 0003-Adjust-error-output-for-regressions-rhbz557655.patch
+0004-Disable-fuser-tests-if-dev-fuse-doesn-t-exist.patch

-- 
Libguestfs Debian packaging