oneechanhax/abuild
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

abuild: only warn when we think there should have been noarch

Browse Source 
and we dont want -dev packages to be noarch
This commit is contained in:
Natanael Copa 2011-01-06 20:21:33 +00:00
parent 66966c5ccc
commit 0db502b906
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
abuild.in
View File

@ -566,6 +566,11 @@ dir_has_arch_binaries() {
return 1 return 1
} }
# returns true if this is the -dev package
is_dev_pkg() {
test "${subpkgname%-dev}" != "$subpkgname"
}
# check that noarch is set if needed # check that noarch is set if needed
archcheck() { archcheck() {
options_has "!archcheck" && return 0 options_has "!archcheck" && return 0
@ -573,10 +578,9 @@ archcheck() {
[ "$arch" != "noarch" ] && return 0 [ "$arch" != "noarch" ] && return 0
error "Arch specific binaries found so arch must not be set to \"noarch\"" error "Arch specific binaries found so arch must not be set to \"noarch\""
return 1 return 1
else elif [ "$arch" != "noarch" ] && ! is_dev_pkg; then
[ "$arch" = "noarch" ] && return 0 # we dont want -dev package go to noarch
error "No arch specific binaries found so arch should be set to \"noarch\"" warning "No arch specific binaries found so arch should probably be set to \"noarch\""
return 1
fi fi
return 0 return 0
} }