[Pkg-haskell-commits] darcs: tools: Better error handling

Joachim Breitner mail at joachim-breitner.de
Sat Oct 13 21:46:52 UTC 2012


Sat Oct 13 21:42:01 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Better error handling
  Ignore-this: 26151eefaf1821fbf0204f734404ad02

    M ./mass-build.sh -3 +11

Sat Oct 13 21:42:01 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Better error handling
  Ignore-this: 26151eefaf1821fbf0204f734404ad02
diff -rN -u old-tools//mass-build.sh new-tools//mass-build.sh
--- old-tools//mass-build.sh	2012-10-13 21:46:52.610767966 +0000
+++ new-tools//mass-build.sh	2012-10-13 21:46:52.623226955 +0000
@@ -98,7 +98,15 @@
 	VERSION=`dpkg-parsechangelog -l$repodir/changelog -c1 | grep-dctrl -n -s Version .`
 	DISTRIBUTION=$(dpkg-parsechangelog -l$repodir/changelog -c1 |grep-dctrl -n -s Distribution .)
 	DSC=${PACKAGE}_${VERSION}.dsc
-	$DEBIAN2DSC $repodir
+
+	if ! $DEBIAN2DSC $repodir
+	then
+		echo "Failed to create $DSC."
+		buildfailed="$buildfailed $dir"
+		popd >/dev/null
+		continue
+	fi
+	
 
 # Does not work, see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=608840
 #	cat > setup.sh <<__END__
@@ -116,14 +124,14 @@
 		"$DSC"
 #		--chroot-setup-commands=$PWD/setup.sh \
 	then
-		rm -f setup.sh
+		#rm -f setup.sh
 		buildok="$buildok $dir"
 		popd >/dev/null
 		pushd $dir >/dev/null
 		debcommit -r
 		popd >/dev/null
 	else
-		rm -f setup.sh
+		#rm -f setup.sh
 		buildfailed="$buildfailed $dir"
 		popd >/dev/null
 	fi





More information about the Pkg-haskell-commits mailing list