[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible: use the force

[Holger Levsen]

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

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit b5bff0936202d468922b683a7543eb30e088c632
Author: Holger Levsen <holger at layer-acht.org>
Date:   Wed Jun 3 15:27:12 2015 +0200

    reproducible: use the force
---
 bin/reproducible_create_meta_pkg_sets.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/reproducible_create_meta_pkg_sets.sh b/bin/reproducible_create_meta_pkg_sets.sh
index 3309326..6ac673e 100755
--- a/bin/reproducible_create_meta_pkg_sets.sh
+++ b/bin/reproducible_create_meta_pkg_sets.sh
@@ -28,7 +28,7 @@ convert_from_deb822_into_source_packages_only() {
 		-e 'else{$s=~s/\s*([\S]+)\s+.*/\1/;print "$s\n"}}' \
 		> ${TMPFILE2} < $TMPFILE
 	sort -u ${TMPFILE2} > $TMPFILE
-	rm ${TMPFILE2}
+	rm -f ${TMPFILE2}
 }
 
 update_target() {
@@ -73,10 +73,10 @@ get_installable_set() {
 	dose-deb-coinstall --deb-native-arch=$ARCH --bg=$PACKAGES --fg=${TMPFILE2} > $TMPFILE
 	RESULT=$?
 	if [ $RESULT -ne 0 ] ; then
-		rm $TMPFILE
+		rm -f $TMPFILE
 		echo "Warning: dose-deb-coinstall cannot calculate the installable set for $1"
 	fi
-	rm -v ${TMPFILE2}
+	rm -f ${TMPFILE2}
 	set -e
 }
 
@@ -175,13 +175,13 @@ update_pkg_sets() {
 
 	# packages which had a DSA
 	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[8]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[8]}.pkgset ] ; then
-		rm ${TMPFILE2}
+		rm -f ${TMPFILE2}
 		svn export svn://svn.debian.org/svn/secure-testing/data/DSA/list ${TMPFILE2}
 		grep "^\[" ${TMPFILE2} | grep "DSA-" | cut -d " " -f5|sort -u > $TMPFILE
 		packages_list_to_deb822
 		convert_from_deb822_into_source_packages_only
 		update_if_similar ${META_PKGSET[8]}.pkgset
-		rm ${TMPFILE2}
+		rm -f ${TMPFILE2}
 	fi
 
 	# gnome and everything it depends on

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git