[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: [PATCH] jenkins.debian.net: Fix architecture check



Hi Wouter,

On Donnerstag, 13. März 2014, Wouter Verhelst wrote:
> I could fix that, but there's actually an easier way, if you have
> debhelper installed. Drop all the grepping; then:
> 
> if [ $(dh_listpackages | wc -l) -eq 0 ]; then
> 	<...error out...>
> fi
> 
> dh_listpackages will list the packages that debhelper "will act upon" on
> this architecture. If the architecture wildcard for a package doesn't
> match our architecture, then the package isn't listed.

cool, thanks.

commit 63a88ecd3adea481b5123217db8b12bd1b1a15a4
Author: Holger Levsen <holger@layer-acht.org>
Date:   Thu Mar 13 19:19:05 2014 +0100

    fixup last commit as suggested by Wouter on the list

diff --git a/bin/d-i_build.sh b/bin/d-i_build.sh
index f5dc063..650b157 100755
--- a/bin/d-i_build.sh
+++ b/bin/d-i_build.sh
@@ -36,14 +36,10 @@ pdebuild_package() {
                echo "Warning: A source package without debian/control, so no 
build will be tried."
                return
        fi
-       ARCH=$(grep 'Architecture:' debian/control | cut -d' ' -f 2)
-       MYARCH=$(dpkg --print-architecture)
-       if [ $ARCH != "all" ] ; then
-               if ! dpkg-architecture -i$ARCH ; then
-                       echo "This package is not to be supposed to be build 
on $MYARCH:"
-                       grep "Architecture:" debian/control
-                       return
-               fi
+       if [ $(dh_listpackages | wc -l) -eq 0 ]; then
+               echo "This package is not to be supposed to be build on 
$MYARCH:"
+               grep "Architecture:" debian/control
+               return


cheers,
	Holger

Attachment: signature.asc
Description: This is a digitally signed message part.


Reply to: