mirror of
https://gitlab.alpinelinux.org/alpine/abuild.git
synced 2024-12-23 07:22:53 +00:00
abuild: fix issue in maintainer check
seems the maintainer variable is not set anymore when building .PKGINFO
This commit is contained in:
parent
aa32ec14e6
commit
ac8b0e55cb
30
abuild.in
30
abuild.in
@ -210,7 +210,7 @@ default_sanitycheck() {
|
||||
[ -n "$pkggroup" ] && spell_error pkggroup pkggroups
|
||||
[ -n "$subpackage" ] && spell_error subpackage subpackages
|
||||
|
||||
get_maintainer || die "Provide a valid RFC822 maintainer address"
|
||||
check_maintainer || die "Provide a valid RFC822 maintainer address"
|
||||
|
||||
makedepends_has 'g++' && warning "g++ should not be in makedepends"
|
||||
return 0
|
||||
@ -721,25 +721,24 @@ git_last_commit() {
|
||||
git log --format=oneline -n 1 "$startdir" | awk '{print $1}'
|
||||
}
|
||||
|
||||
# this will try to check for a valid rfc822 address
|
||||
check_rfc822() {
|
||||
local address="$1"
|
||||
case "$address" in
|
||||
*[A-Za-z0-9]*\ \<*@*.*\>) ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
}
|
||||
|
||||
get_maintainer() {
|
||||
if [ -z "$maintainer" ]; then
|
||||
maintainer=$(awk -F': ' '/\# *Maintainer/ {print $2}' "$APKBUILD")
|
||||
# remove surrounding whitespace
|
||||
maintainer=$(echo "$maintainer" | xargs)
|
||||
if ! [ -z "$maintainer" ]; then
|
||||
check_rfc822 "$maintainer" || return 1
|
||||
else
|
||||
warning "No maintainer"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
check_maintainer() {
|
||||
get_maintainer
|
||||
if [ -z "$maintainer" ]; then
|
||||
warning "No maintainer"
|
||||
else
|
||||
# try to check for a valid rfc822 address
|
||||
case "$maintainer" in
|
||||
*[A-Za-z0-9]*\ \<*@*.*\>) ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
fi
|
||||
}
|
||||
|
||||
@ -805,6 +804,7 @@ EOF
|
||||
fi
|
||||
echo "commit = $last_commit" >> "$pkginfo"
|
||||
|
||||
get_maintainer
|
||||
if [ -n "$maintainer" ]; then
|
||||
echo "maintainer = $maintainer" >> "$pkginfo"
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user