makepkg: lint_pkgver: Run even if PKGVERFUNC
lint_pkgver returns 0 if PKGVERFUNC, since it's likely that update_pkgver()
will change the value of pkgver anyway, and there's no point in linting the
old value. update_pkgver() will call check_pkgver() itself to validate the
new value.
However, that "optimization" only holds if we're definitely going to call
update_pkgver() later; and that's way more complicated than
if (( PKGVERFUNC )); then
it's more like:
if (( !GENINTEG && !PACKAGELIST && !PRINTSRCINFO && !SOURCEONLY && !REPKG && PKGVERFUNC )); then
Which is to say: If I have a PKGBUILD with pkgver():
* if I run `makepkg -g` I expect it to lint pkgver, but it won't
* if I run `makepkg -R` I expect it to lint pkgver, but it won't
* ...
So let's fix that.
Rather than try to keep a huge list of conditions in sync with the flow of
makepkg.sh.in, let's just drop it. As far as I can tell, the only thing
that skipping lint_pkgver() really enables is letting the PKGBUILD author
write `pkgver=` in the initial version, and letting pkgver() fill it in.
They can just start writing `pkgver=0` for that workflow.
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
parent
192d6166e9
commit
cd7b2d6e07
1 changed files with 0 additions and 5 deletions
|
|
@ -44,10 +44,5 @@ check_pkgver() {
|
|||
}
|
||||
|
||||
lint_pkgver() {
|
||||
if (( PKGVERFUNC )); then
|
||||
# defer check to after getting version from pkgver function
|
||||
return 0
|
||||
fi
|
||||
|
||||
check_pkgver "$pkgver"
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue