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>
This commit is contained in:
parent
23745a7bf2
commit
dd2d6f980b
1 changed files with 4 additions and 3 deletions
|
@ -1321,8 +1321,11 @@ if [ "$install" -a ! -f "$install" ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
devel_check
|
||||||
|
|
||||||
if [ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \
|
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
|
if [ "$INSTALL" = "1" ]; then
|
||||||
warning "$(gettext "A package has already been built, installing existing package...")"
|
warning "$(gettext "A package has already been built, installing existing package...")"
|
||||||
install_package
|
install_package
|
||||||
|
@ -1333,8 +1336,6 @@ if [ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
devel_check
|
|
||||||
|
|
||||||
# Run the bare minimum in fakeroot
|
# Run the bare minimum in fakeroot
|
||||||
# fix flyspray bug 6208 -- using makepkg with fakeroot gives an error
|
# fix flyspray bug 6208 -- using makepkg with fakeroot gives an error
|
||||||
if [ "$INFAKEROOT" = "1" ]; then
|
if [ "$INFAKEROOT" = "1" ]; then
|
||||||
|
|
Loading…
Add table
Reference in a new issue