Commit c7e4d10d introduced a small error in the testing of whether
a package is already built.

Signed-off-by: Allan McRae <[email protected]>
---
 scripts/makepkg.sh.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 989b252..7e10eef 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1724,7 +1724,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...")"
@@ -1740,7 +1740,7 @@ else
        somepkgbuilt=0
        for pkg in ${pkgna...@]}; 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
-- 
1.6.5.1


Reply via email to