summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Horowitz <stonecrest@gmail.com>2007-11-08 00:26:01 -0700
committerDan McGee <dan@archlinux.org>2007-11-08 07:15:37 -0600
commitdd2d6f980bb4dd3ab099f0783172c7801aa4beb5 (patch)
tree3bda6fbe99ca01ef520a1cd80db1297698a9cd1e
parent23745a7bf24ffd0c44279019563502568cc1c5fb (diff)
downloadpacman-dd2d6f980bb4dd3ab099f0783172c7801aa4beb5.tar.xz
Correctly handle version comparisons for SVN/CVS/etc PKGBUILDS.
Retrieve SVN/CVS/etc revision number before checking if the package has already been built. This allows building a newer version of a developmental package without having to use -f. Now -f will only be needed if the latest SVN/CVS/etc revision is the same as the built package. Signed-off-by: Scott Horowitz <stonecrest@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--scripts/makepkg.sh.in7
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index f3e4741b..0e38d2c1 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1321,8 +1321,11 @@ if [ "$install" -a ! -f "$install" ]; then
exit 1
fi
+devel_check
+
if [ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \
- -a "$FORCE" = "0" -a "$GENINTEG" = "0" -a "$SOURCEONLY" = "0" ]; then
+ -a "$FORCE" = "0" -a "$GENINTEG" = "0" -a "$SOURCEONLY" = "0" \
+ -a "$FORCE_VER" = "" ]; then
if [ "$INSTALL" = "1" ]; then
warning "$(gettext "A package has already been built, installing existing package...")"
install_package
@@ -1333,8 +1336,6 @@ if [ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \
fi
fi
-devel_check
-
# Run the bare minimum in fakeroot
# fix flyspray bug 6208 -- using makepkg with fakeroot gives an error
if [ "$INFAKEROOT" = "1" ]; then