From 3758ccbb524b502cc6162324f1b953215b6b970e Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Wed, 21 Oct 2009 13:40:17 +1000 Subject: makepkg: fix testing for built package presence Commit c7e4d10d introduced a small error in the testing of whether a package is already built. Signed-off-by: Allan McRae Signed-off-by: Dan McGee --- scripts/makepkg.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 0ce5353f..40367aed 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1722,7 +1722,7 @@ pkgbase=${pkgbase:-${pkgname[0]}} if [ "$SPLITPKG" -eq 0 ]; then if [ \( -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \ - -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-any${PKGEXT}" \) \ + -o -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-any${PKGEXT}" \) \ -a "$FORCE" -eq 0 -a "$SOURCEONLY" -eq 0 -a "$NOBUILD" -eq 0 ]; then if [ "$INSTALL" -eq 1 ]; then warning "$(gettext "A package has already been built, installing existing package...")" @@ -1738,7 +1738,7 @@ else somepkgbuilt=0 for pkg in ${pkgname[@]}; do if [ \( -f "$PKGDEST/${pkg}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \ - -f "$PKGDEST/${pkg}-${pkgver}-${pkgrel}-any${PKGEXT}" \) ]; then + -o -f "$PKGDEST/${pkg}-${pkgver}-${pkgrel}-any${PKGEXT}" \) ]; then somepkgbuilt=1 else allpkgbuilt=0 -- cgit v1.2.3-70-g09d2