diff options
author | Luke Shumaker <lukeshu@parabola.nu> | 2018-08-09 19:42:37 +0200 |
---|---|---|
committer | Allan McRae <allan@archlinux.org> | 2018-09-19 10:01:23 +0200 |
commit | cd7b2d6e07bdbc11f8973bedef0cb0ef02f81563 (patch) | |
tree | 4bf4e624ee13f8905ef2c3308ced5a531f8589fe | |
parent | 192d6166e9cb2a8f26d7256690e0158bd5a5d226 (diff) | |
download | pacman-cd7b2d6e07bdbc11f8973bedef0cb0ef02f81563.tar.gz pacman-cd7b2d6e07bdbc11f8973bedef0cb0ef02f81563.tar.xz |
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>
-rw-r--r-- | scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in b/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in index c105212b..8d5d04f1 100644 --- a/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in @@ -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" } |