diff options
| author | Allan McRae <allan@archlinux.org> | 2009-10-21 05:40:17 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2009-10-21 06:32:50 +0200 |
| commit | 3758ccbb524b502cc6162324f1b953215b6b970e (patch) | |
| tree | 29b2dbcf3204e750d1721c02c43ab8c8a49b1fac | |
| parent | 6c635d76a042add78f65f732928c2f10c2e5567a (diff) | |
| download | pacman-3758ccbb524b502cc6162324f1b953215b6b970e.tar.gz pacman-3758ccbb524b502cc6162324f1b953215b6b970e.tar.xz | |
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 <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | 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 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 |