From 2fd79aaa4a94d4ce4ad261bd0d7f376bc5d6538a Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Mon, 2 Mar 2015 23:15:52 +0100
Subject: ignore-fail-on-non-empty doesnt work as advertised, sigh

---
 bin/reproducible_html_graphs.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'bin/reproducible_html_graphs.sh')

diff --git a/bin/reproducible_html_graphs.sh b/bin/reproducible_html_graphs.sh
index e07790bb..debb3eb7 100755
--- a/bin/reproducible_html_graphs.sh
+++ b/bin/reproducible_html_graphs.sh
@@ -223,10 +223,11 @@ redo_png() {
 	sqlite3 -init ${INIT} -csv ${PACKAGES_DB} "SELECT ${FIELDS[$1]} from ${TABLE[$1]} ${WHERE_EXTRA} ORDER BY datum" >> ${TABLE[$1]}.csv
 	# only generate graph is the query returned data
 	if [ $(cat ${TABLE[$1]}.csv | wc -l) -gt 1 ] ; then
-		mkdir -p $(dirname $2)
+		DIR=$(dirname $2)
+		mkdir -p $DIR
 		/srv/jenkins/bin/make_graph.py ${TABLE[$1]}.csv $2 ${COLOR[$1]} "${MAINLABEL[$1]}" "${YLABEL[$1]}"
 		mv $2 /var/lib/jenkins/userContent/$SUITE
-		rmdir --ignore-fail-on-non-empty $(dirname $2)
+		[ "$DIR" = "." ] || rmdir $(dirname $2)
 	fi
 	rm ${TABLE[$1]}.csv
 }
-- 
cgit v1.2.3-70-g09d2