diff options
| author | Dave Reisner <dreisner@archlinux.org> | 2014-11-08 23:30:30 -0500 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2014-11-09 15:35:12 +1000 |
| commit | bd746568f6554789537baf96e5f75ff35737bd98 (patch) | |
| tree | b340b1792c40f10233732ae826ebce152ec441ac /scripts | |
| parent | 03aa44a3ecab8ede51d3a6a780017b59babe2965 (diff) | |
| download | pacman-bd746568f6554789537baf96e5f75ff35737bd98.tar.xz | |
makepkg: simplify epoch handling
We can avoid setting a default value for epoch since we intend to mean
unset and "0" as the same thing. This is also a more consistent default
as the display of epoch=0 is no epoch at all in the full package
version.
The extra paranoia in get_full_version can be removed due to lint_epoch
guarding against non-integer values of epoch.
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/makepkg.sh.in | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 90486767..539a5221 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -866,7 +866,6 @@ update_pkgver() { fi @SEDINPLACE@ "s:^pkgrel=[^ ]*:pkgrel=1:" "$BUILDFILE" source_safe "$BUILDFILE" - epoch=${epoch:-0} local fullver=$(get_full_version) msg "$(gettext "Updated version: %s")" "$pkgbase $fullver" else @@ -888,7 +887,7 @@ missing_source_file() { # return : full version spec, including epoch (if necessary), pkgver, pkgrel ## get_full_version() { - if [[ $epoch ]] && (( epoch > 0 )); then + if (( epoch > 0 )); then printf "%s\n" "$epoch:$pkgver-$pkgrel" else printf "%s\n" "$pkgver-$pkgrel" @@ -3364,7 +3363,6 @@ fi # set defaults if they weren't specified in buildfile pkgbase=${pkgbase:-${pkgname[0]}} -epoch=${epoch:-0} basever=$(get_full_version) if [[ $BUILDDIR = "$startdir" ]]; then |