From 479cca4a44124b36f41872940adfb183597f40e7 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 6 Jan 2011 20:21:33 +0000 Subject: [PATCH] abuild: only warn when we think there should have been noarch and we dont want -dev packages to be noarch --- abuild.in | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/abuild.in b/abuild.in index 904b1c3..0b602ca 100755 --- a/abuild.in +++ b/abuild.in @@ -566,6 +566,11 @@ dir_has_arch_binaries() { return 1 } +# returns true if this is the -dev package +is_dev_pkg() { + test "${subpkgname%-dev}" != "$subpkgname" +} + # check that noarch is set if needed archcheck() { options_has "!archcheck" && return 0 @@ -573,10 +578,9 @@ archcheck() { [ "$arch" != "noarch" ] && return 0 error "Arch specific binaries found so arch must not be set to \"noarch\"" return 1 - else - [ "$arch" = "noarch" ] && return 0 - error "No arch specific binaries found so arch should be set to \"noarch\"" - return 1 + elif [ "$arch" != "noarch" ] && ! is_dev_pkg; then + # we dont want -dev package go to noarch + warning "No arch specific binaries found so arch should probably be set to \"noarch\"" fi return 0 } -- 1.7.3.4