[Pkg-libvirt-commits] [SCM] Libguestfs Debian packaging branch, experimental, updated. debian/1%1.21.40-1

[Richard W.M. Jones]

The following commit has been merged in the experimental branch:
commit fae4a2cfb99bab26f3bd60f52e4a586e39f54f49
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Mon May 20 09:00:16 2013 +0100

    appliance: Don't use 'rm -f' on files which ought to exist.

diff --git a/appliance/Makefile.am b/appliance/Makefile.am
index 90df421..ab351b6 100644
--- a/appliance/Makefile.am
+++ b/appliance/Makefile.am
@@ -57,7 +57,7 @@ make.sh: make.sh.in $(top_builddir)/config.log $(top_builddir)/config.status
 	  ./config.status --file=appliance/$@-t:appliance/$<
 	chmod +x $@-t
 	cmp -s $@ $@-t || mv $@-t $@
-	rm -f $@-t
+	rm $@-t
 
 PACKAGELIST_CPP_FLAGS = -D$(DISTRO)=1 -DEXTRA_PACKAGES="$(EXTRA_PACKAGES)"
 if VALGRIND_DAEMON
@@ -68,13 +68,13 @@ packagelist: packagelist.in Makefile
 	cpp -undef $(PACKAGELIST_CPP_FLAGS) < $< | \
 	grep -v '^[[:space:]]*$$' | grep -v '^#' > $@-t
 	cmp -s $@ $@-t || mv $@-t $@
-	rm -f $@-t
+	rm $@-t
 
 excludelist: excludelist.in Makefile
 	cpp -undef $(PACKAGELIST_CPP_FLAGS) < $< | \
 	grep -v '^[[:space:]]*$$' | grep -v '^#' > $@-t
 	cmp -s $@ $@-t || mv $@-t $@
-	rm -f $@-t
+	rm $@-t
 
 supermin.d/base.img supermin.d/hostfiles: stamp-supermin
 stamp-supermin: make.sh packagelist excludelist
@@ -89,7 +89,7 @@ supermin.d/daemon.img: ../daemon/guestfsd guestfsd.suppressions
 	ln ../daemon/guestfsd tmp-d$(DAEMON_SUPERMIN_DIR)/guestfsd
 	ln $(srcdir)/guestfsd.suppressions tmp-d/etc/guestfsd.suppressions
 	( cd tmp-d && find | cpio --quiet -o -H newc ) > $@-t
-	rm -rf tmp-d
+	rm -r tmp-d
 	mv $@-t $@
 
 supermin.d/init.img: init
@@ -108,7 +108,7 @@ supermin.d/udev-rules.img: 99-guestfs-serial.rules
 	mkdir -p tmp-u/etc/udev/rules.d
 	for f in $^; do ln $$f tmp-u/etc/udev/rules.d/$$(basename $$f); done
 	( cd tmp-u && find | cpio --quiet -o -H newc ) > $@-t
-	rm -rf tmp-u
+	rm -r tmp-u
 	mv $@-t $@
 
 # If installing the daemon, install the udev rules too.

-- 
Libguestfs Debian packaging