[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 4db269cfe648f772f01966cbfc27ff8a864ae496
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Tue May 21 18:12:07 2013 +0100

    appliance: Use 'rm -f' on files which might have been moved so might not exist.
    
    This partially reverts commit fae4a2cfb99bab26f3bd60f52e4a586e39f54f49.

diff --git a/appliance/Makefile.am b/appliance/Makefile.am
index ab351b6..8e50156 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 $@-t
+	rm -f $@-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 $@-t
+	rm -f $@-t
 
 excludelist: excludelist.in Makefile
 	cpp -undef $(PACKAGELIST_CPP_FLAGS) < $< | \
 	grep -v '^[[:space:]]*$$' | grep -v '^#' > $@-t
 	cmp -s $@ $@-t || mv $@-t $@
-	rm $@-t
+	rm -f $@-t
 
 supermin.d/base.img supermin.d/hostfiles: stamp-supermin
 stamp-supermin: make.sh packagelist excludelist

-- 
Libguestfs Debian packaging