[Pkg-haskell-commits] [tools] 07/07: mass-build: Use dpkg-parsechangelog -S instead of grep-dctrl

[Joachim Breitner]

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

nomeata pushed a commit to branch master
in repository tools.

commit e5aa38c94cb2764f2b9e854dd72f2a61c716b609
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Sun Dec 21 21:58:00 2014 +0100

    mass-build: Use dpkg-parsechangelog -S instead of grep-dctrl
---
 mass-build.sh | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/mass-build.sh b/mass-build.sh
index e9b46c0..5302f4f 100755
--- a/mass-build.sh
+++ b/mass-build.sh
@@ -84,13 +84,13 @@ do
 	fi
 
 	set -e
-	dist=$(dpkg-parsechangelog -lchangelog -c1 |grep-dctrl -n -s Distribution .)
-	version=$(dpkg-parsechangelog -lchangelog -c1 |grep-dctrl -n -s Version .)
+	dist=$(dpkg-parsechangelog -lchangelog -c1 -SDistribution)
 	set +e
 	if [ "$dist" = "UNRELEASED" ]
 	then
 		nottobuild="$nottobuild $dir"
 	else
+		version=$(dpkg-parsechangelog -lchangelog -c1 -SVersion)
 		if darcs show tags | fgrep -x -q "$version" 
 		then
 			released="$released $dir"
@@ -127,14 +127,14 @@ do
 		exit
 	fi
 
-	PACKAGE=`dpkg-parsechangelog -l$repodir/changelog -c1 | grep-dctrl -n -s Source .`
-	VERSION=`dpkg-parsechangelog -l$repodir/changelog -c1 | grep-dctrl -n -s Version .`
+	PACKAGE=`dpkg-parsechangelog -l$repodir/changelog -c1 -SSource`
+	VERSION=`dpkg-parsechangelog -l$repodir/changelog -c1 -SVersion`
         UPSTREAM=`echo $VERSION | cut -d- -f1` # this could be improved
         if echo $UPSTREAM | fgrep -q : ; then
         	UPSTREAM=`echo $UPSTREAM | cut -d: -f2-`
         	VERSION=`echo $VERSION | cut -d: -f2-`
         fi
-	DISTRIBUTION=$(dpkg-parsechangelog -l$repodir/changelog -c1 |grep-dctrl -n -s Distribution .)
+	DISTRIBUTION=$(dpkg-parsechangelog -l$repodir/changelog -c1 -SDistribution)
 	DSC=${PACKAGE}_${VERSION}.dsc
 
 	if ! $DEBIAN2DSC $repodir && [ -e $DSC ]
@@ -193,10 +193,11 @@ then
 	echo "Failed to switch to $tmpdir"
 	exit
 fi
+
 dpkg-scansources . > Sources
 schroot -c $schroot -- bash -c "cat /var/lib/apt/lists/*Packages" > Packages
-dose-builddebcheck --explain --failures --deb-native-arch=amd64 Packages Sources > ../edos-failures.log
-installable="$(dose-builddebcheck --successes --deb-native-arch=amd64 Packages Sources|perl -ne 'print "$1\n" if /package: src:(.*)/')"
+dose-builddebcheck --explain --failures --deb-native-arch=$arch Packages Sources > ../edos-failures.log
+installable="$(dose-builddebcheck --successes --deb-native-arch=$arch Packages Sources|perl -ne 'print "$1\n" if /package: src:(.*)/')"
 popd >/dev/null
 
 #echo "The following $(echo $uninstallable|wc -w) packages are uninstallable:"
@@ -214,7 +215,7 @@ do
 	repodir=$PWD
 	popd >/dev/null
 
-	PACKAGE=`dpkg-parsechangelog -l$repodir/changelog -c1 | grep-dctrl -n -s Source .`
+	PACKAGE=`dpkg-parsechangelog -l$repodir/changelog -c1 -SSource`
 
 	if ! echo "$installable" | fgrep -xq "$PACKAGE"
 	then
@@ -223,13 +224,13 @@ do
 		continue
 	fi
 
-	VERSION=`dpkg-parsechangelog -l$repodir/changelog -c1 | grep-dctrl -n -s Version .`
+	VERSION=`dpkg-parsechangelog -l$repodir/changelog -c1 -SVersion`
         UPSTREAM=`echo $VERSION | cut -d- -f1` # this could be improved
         if echo $UPSTREAM | fgrep -q : ; then
         	UPSTREAM=`echo $UPSTREAM | cut -d: -f2-`
         	VERSION=`echo $VERSION | cut -d: -f2-`
         fi
-	DISTRIBUTION=$(dpkg-parsechangelog -l$repodir/changelog -c1 |grep-dctrl -n -s Distribution .)
+	DISTRIBUTION=$(dpkg-parsechangelog -l$repodir/changelog -c1 -SDistribution)
 	DSC=${PACKAGE}_${VERSION}.dsc
 
 

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