[Qa-jenkins-scm] [jenkins.debian.net] 02/05: openwrt: use hard (-f) rm to clear temporary files

[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 ccf4dee56e1c2ea7b1277919aca087728db762d0
Author: bnewbold <bnewbold at robocracy.org>
Date:   Wed Oct 21 16:34:08 2015 -0700

    openwrt: use hard (-f) rm to clear temporary files
    
    This fixes some hangs and bugs I ran in to while testing.
---
 bin/reproducible_openwrt.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/reproducible_openwrt.sh b/bin/reproducible_openwrt.sh
index 15fd2d3..af09251 100755
--- a/bin/reproducible_openwrt.sh
+++ b/bin/reproducible_openwrt.sh
@@ -14,8 +14,8 @@ set -e
 
 cleanup_tmpdirs() {
 	cd
-	rm -r $TMPDIR
-	rm -r $TMPBUILDDIR
+	rm -rf $TMPDIR
+	rm -rf $TMPBUILDDIR
 }
 
 create_results_dirs() {
@@ -88,9 +88,9 @@ openwrt_build() {
 }
 
 openwrt_cleanup() {
-	rm build_dir/target-* -r
-	rm staging_dir/target-* -r
-	rm bin/* -r
+	rm build_dir/target-* -rf
+	rm staging_dir/target-* -rf
+	rm bin/* -rf
 }
 
 build_two_times() {
@@ -199,7 +199,7 @@ BANNER_HTML=$(mktemp --tmpdir=$TMPDIR)
 cat $(find build_dir/ -name banner | grep etc/banner|head -1) >> $BANNER_HTML
 
 # clean up builddir to save space on tmpfs
-rm -r $TMPBUILDDIR/openwrt
+rm -rf $TMPBUILDDIR/openwrt
 
 # run diffoscope on the results
 # (this needs refactoring rather badly)

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