summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2011-08-08 23:20:53 +0200
committerDan McGee <dan@archlinux.org>2011-08-08 23:47:47 +0200
commit1a919a11b85cb882bf5e632036a9030e4a98aba0 (patch)
tree702a2379cf28e0031fc95db89c69ce083a342da2
parent1e16b94a85678bc6d055e19f0efbd5bb680c5032 (diff)
downloadpacman-1a919a11b85cb882bf5e632036a9030e4a98aba0.tar.gz
pacman-1a919a11b85cb882bf5e632036a9030e4a98aba0.tar.xz
makepkg: ignore epoch when undeclared
In this case, we skip the epoch versioning entirely, as if it were declared as 0. Prevents errors such as: /usr/bin/makepkg: line 244: ((: ! : syntax error: operand expected (error token is " ") ==> Finished making: cower-git :20110808-1 (Mon Aug 8 17:17:27 EDT 2011) Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--scripts/makepkg.sh.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index fa0ceb2e..72f4d493 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -241,7 +241,7 @@ get_url() {
##
get_full_version() {
if [[ -z $1 ]]; then
- if (( ! $epoch )); then
+ if [[ $epoch ]] && (( ! $epoch )); then
echo $pkgver-$pkgrel
else
echo $epoch:$pkgver-$pkgrel