summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2008-06-13 02:21:06 +0200
committerDan McGee <dan@archlinux.org>2008-06-13 02:21:06 +0200
commit7313c8546ae0a2c38768d665b3f314ee0cf959c4 (patch)
treeb2b2008f529f642af9b9485ccc3cb763609b2780 /scripts
parent0077bfa3a07725db281c55821a459acb84895225 (diff)
parent331891ceb158a4fc1e47ae52d3968ebdb7e9b223 (diff)
downloadpacman-7313c8546ae0a2c38768d665b3f314ee0cf959c4.tar.gz
pacman-7313c8546ae0a2c38768d665b3f314ee0cf959c4.tar.xz
Merge branch 'maint'
Diffstat (limited to 'scripts')
-rw-r--r--scripts/makepkg.sh.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 70d8e15a..5bdc5bc9 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1368,7 +1368,7 @@ devel_check
devel_update
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 "$NOBUILD" = "0" ]; then
if [ "$INSTALL" = "1" ]; then
warning "$(gettext "A package has already been built, installing existing package...")"
install_package