diff options
| author | Allan McRae <allan@archlinux.org> | 2015-05-12 15:46:36 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2015-05-16 06:10:42 +0200 |
| commit | 9302593cfb8a5a845dab501cfaef71ea5d54933a (patch) | |
| tree | e85cb1ee47399b3b822b1076fd3612bf6ec17dac /scripts/makepkg.sh.in | |
| parent | c9a7b7e0bf6a5768f6ca433dc14a3344899bb0cd (diff) | |
| download | pacman-9302593cfb8a5a845dab501cfaef71ea5d54933a.tar.gz pacman-9302593cfb8a5a845dab501cfaef71ea5d54933a.tar.xz | |
makepkg: merge validate_pkgver into check_pkgver
The check that pkgver is non-empty done in check_pkgver should also be
performed after running the pkgver() function. Merge validate_pkgver
into check_pkgver and run check_pkgver after updating pkgver.
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'scripts/makepkg.sh.in')
| -rw-r--r-- | scripts/makepkg.sh.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4885341c..11e64593 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -824,7 +824,7 @@ download_sources() { # Re-sources the PKGBUILD afterwards to allow for other variables that use $pkgver update_pkgver() { newpkgver=$(run_function_safe pkgver) - if ! validate_pkgver "$newpkgver"; then + if ! check_pkgver "$newpkgver"; then error "$(gettext "pkgver() generated an invalid version: %s")" "$newpkgver" exit 1 fi |