Linux Archive

Linux Archive (http://www.linux-archive.org/)
-   ArchLinux Pacman Development (http://www.linux-archive.org/archlinux-pacman-development/)
-   -   Ensure pkgbase/epoch are defined before doing anything (http://www.linux-archive.org/archlinux-pacman-development/487079-ensure-pkgbase-epoch-defined-before-doing-anything.html)

Dan McGee 02-09-2011 12:56 PM

Ensure pkgbase/epoch are defined before doing anything
 
When generating integrity sums, we could get some weird output before due to
epoch being uninitialized:

/usr/bin/makepkg: line 234: [[: 2.6.37: syntax error: invalid arithmetic operator (error token is ".6.37")

Signed-off-by: Dan McGee <dan@archlinux.org>
---
scripts/makepkg.sh.in | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 001178a..16dc0b8 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1850,6 +1850,10 @@ else
source "$BUILDFILE"
fi

+# set defaults if they weren't specified in buildfile
+pkgbase=${pkgbase:-${pkgname[0]}}
+epoch=${epoch:-0}
+
if (( GENINTEG )); then
mkdir -p "$srcdir"
chmod a-s "$srcdir"
@@ -1859,9 +1863,6 @@ if (( GENINTEG )); then
exit 0 # $E_OK
fi

-pkgbase=${pkgbase:-${pkgname[0]}}
-epoch=${epoch:-0}
-
# check the PKGBUILD for some basic requirements
check_sanity || exit 1

--
1.7.4

Allan McRae 02-10-2011 12:32 AM

Ensure pkgbase/epoch are defined before doing anything
 
On 09/02/11 23:56, Dan McGee wrote:

When generating integrity sums, we could get some weird output before due to
epoch being uninitialized:

/usr/bin/makepkg: line 234: [[: 2.6.37: syntax error: invalid arithmetic operator (error token is ".6.37")

Signed-off-by: Dan McGee<dan@archlinux.org>


Signed-off-by: Allan


All times are GMT. The time now is 06:49 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.