[Pkg-libvirt-commits] [libguestfs] 23/24: Fixed FTBFS on architectures without zfs-fuse

[Hilko Bengen]

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

bengen pushed a commit to branch master
in repository libguestfs.

commit d1bd0532c9c87a0b3e179166e10884a3db6407d2
Author: Hilko Bengen <bengen at debian.org>
Date:   Fri Oct 3 15:57:03 2014 +0200

    Fixed FTBFS on architectures without zfs-fuse
---
 debian/gen-appliance-depends.sh | 2 +-
 debian/split-appliance.sh       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/gen-appliance-depends.sh b/debian/gen-appliance-depends.sh
index 33ce60c..bc383e5 100755
--- a/debian/gen-appliance-depends.sh
+++ b/debian/gen-appliance-depends.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -e
+set -ex
 
 pkglist_to_deps() {
     echo -n 'appliance:Depends='
diff --git a/debian/split-appliance.sh b/debian/split-appliance.sh
index f327651..4214763 100755
--- a/debian/split-appliance.sh
+++ b/debian/split-appliance.sh
@@ -1,13 +1,13 @@
 #!/bin/sh
 
-set -e
+set -ex
 
 cd debian/tmp/usr/lib/*-*/guestfs/supermin.d
 cp -n packages packages.orig
 
 for p in gfs2 hfsplus jfs nilfs reiserfs rsync xfs zfs; do
     sed -i -e "/$p/d" packages
-    grep -F  "$p" < packages.orig > packages-$p
+    grep -F  "$p" < packages.orig > packages-$p || true
 done
 
 sed -i -e "/^\(iputils\|lsof\|openssh-server\|strace\|vim\)/d" packages

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