[Pkg-nagios-changes] [icinga] 23/36: Use rm -f for all rm commands.

[Bas Couwenberg]

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

sebastic pushed a commit to branch modern-packaging
in repository icinga.

commit f5f95a894e9e95a05f9b4b1ed834bd334557a525
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Dec 18 11:54:33 2016 +0100

    Use rm -f for all rm commands.
---
 debian/changelog |  1 +
 debian/rules     | 18 +++++++++---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4b7c23d..34495b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ icinga (1.13.3-4) UNRELEASED; urgency=medium
   * Don't install .in templates in examples.
   * Don't install p1.pl with execute bit set.
   * Use dh sequencer in rules file.
+  * Use rm -f for all rm commands.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 03 Dec 2016 23:27:06 +0100
 
diff --git a/debian/rules b/debian/rules
index 6e564aa..3424011 100755
--- a/debian/rules
+++ b/debian/rules
@@ -82,14 +82,14 @@ override_dh_auto_clean:
 	if test -f Makefile; then make distclean; fi
 	rm -f install-stamp configure-stamp build-stamp fix-configs-stamp
 	rm -rf debian-configs
-	-rm contrib/perlxsi.c
+	-rm -f contrib/perlxsi.c
 	find -type d -name autom4te.cache -print0 | xargs -0 -r rm -rf \;
 	-rm -f platform.h auto-include.h
-	-rm solaris/pkginfo
-	-rm contrib/eventhandlers/submit_check_result contrib/eventhandlers/disable_active_service_checks
-	-rm contrib/eventhandlers/disable_notifications contrib/eventhandlers/enable_active_service_checks
-	-rm contrib/eventhandlers/enable_notifications
-	-rm config.log
+	-rm -f solaris/pkginfo
+	-rm -f contrib/eventhandlers/submit_check_result contrib/eventhandlers/disable_active_service_checks
+	-rm -f contrib/eventhandlers/disable_notifications contrib/eventhandlers/enable_active_service_checks
+	-rm -f contrib/eventhandlers/enable_notifications
+	-rm -f config.log
 	find -type d -name build -print0 | xargs -0 -r rm -rf \;
 	find \( -name config.sub -o -name config.guess \) -print0 | xargs -0 -r rm -f \;
 
@@ -116,7 +116,7 @@ override_dh_auto_install: fix-configs-stamp
 	dh_installdirs -a -i
 	$(MAKE) install-unstripped DESTDIR=$b/tmp INSTALL_OPTS="" COMMAND_OPTS=""
 	$(MAKE) install-idoutils DESTDIR=$b/icinga-idoutils INSTALL_OPTS="" COMMAND_OPTS=""
-	rm $b/icinga-idoutils/etc/icinga/ido2db.cfg-sample
+	rm -f $b/icinga-idoutils/etc/icinga/ido2db.cfg-sample
 	#We have to rename the sample files
 	#mv $b/icinga-idoutils/etc/icinga/ido2db.cfg-sample $b/icinga-idoutils/etc/icinga/ido2db.cfg
 	mv $b/icinga-idoutils/etc/icinga/idomod.cfg-sample $b/icinga-idoutils/etc/icinga/idomod.cfg
@@ -181,14 +181,14 @@ override_dh_install-indep:
 	chown root:www-data ${b}/icinga-common/var/lib/icinga/rw
 	chmod 700 ${b}/icinga-common/var/lib/icinga/rw
 
-	rm ${b}/icinga-common/usr/share/icinga/plugins/eventhandlers/*.in
+	rm -f ${b}/icinga-common/usr/share/icinga/plugins/eventhandlers/*.in
 	chmod +x ${b}/icinga-common/usr/share/icinga/plugins/eventhandlers/* \
 	         ${b}/icinga-common/usr/share/icinga/plugins/eventhandlers/distributed-monitoring/* \
 	         ${b}/icinga-common/usr/share/icinga/plugins/eventhandlers/redundancy-scenario1/*
 
 	chmod 755 ${b}/icinga-common/var/lib/icinga
 	# the real version is in -cgi
-	rm ${b}/icinga-common/etc/icinga/cgi.cfg
+	rm -f ${b}/icinga-common/etc/icinga/cgi.cfg
 
 	chmod 600 ${b}/icinga-common/etc/icinga/resource.cfg
 	chmod +x ${b}/icinga-common/usr/share/icinga/plugins/eventhandlers/submit_check_result

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