mirror of
https://github.com/moparisthebest/pacman
synced 2024-08-13 17:03:46 -04:00
makepkg: deal with variable substitution when checking sanity
If any of pkgver, pkgrel or epoch contained a variable substitution, then it needed to be evaluated before checking its value conformed to the rules. [Dan: add quotes around RHS] Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
parent
2a466c2abc
commit
c28052e45b
@ -1451,6 +1451,7 @@ check_sanity() {
|
||||
|
||||
awk -F'=' '/^[[:space:]]*pkgver=/ { $1=""; print $0 }' "$BUILDFILE" |
|
||||
while read i _; do
|
||||
eval i="$i"
|
||||
if [[ $i =~ [[:space:]:-] ]]; then
|
||||
error "$(gettext "%s is not allowed to contain colons, hyphens or whitespace.")" "pkgver"
|
||||
return 1
|
||||
@ -1459,6 +1460,7 @@ check_sanity() {
|
||||
|
||||
awk -F'=' '/^[[:space:]]*pkgrel=/ { $1=""; print $0 }' "$BUILDFILE" |
|
||||
while read i _; do
|
||||
eval i="$i"
|
||||
if [[ $i =~ [[:space:]-] ]]; then
|
||||
error "$(gettext "%s is not allowed to contain hyphens or whitespace.")" "pkgrel"
|
||||
return 1
|
||||
@ -1467,6 +1469,7 @@ check_sanity() {
|
||||
|
||||
awk -F'=' '/^[[:space:]]*epoch=/ { $1=""; print $0 }' "$BUILDFILE" |
|
||||
while read i _; do
|
||||
eval i="$i"
|
||||
if [[ ! $i =~ ^[0-9]*$ ]]; then
|
||||
error "$(gettext "%s must be an integer.")" "epoch"
|
||||
return 1
|
||||
|
Loading…
Reference in New Issue
Block a user