summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Griffin <aaron@archlinux.org>2006-12-21 21:03:41 +0100
committerAaron Griffin <aaron@archlinux.org>2006-12-21 21:03:41 +0100
commitf104023999c1f2ebd1034ee4925e95b30ba16ff2 (patch)
tree6f4690c47ccab678bd4055c43a9215b9d8323663
parent7dacc70b77d12a0d04cd2a06e512d93641d198ec (diff)
downloadpacman-f104023999c1f2ebd1034ee4925e95b30ba16ff2.tar.gz
pacman-f104023999c1f2ebd1034ee4925e95b30ba16ff2.tar.xz
* Dan McGee <dpmcgee@gmail.com>
Formating / comment changes Fix dep check conditional
-rwxr-xr-xscripts/makepkg6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/makepkg b/scripts/makepkg
index cd753eeb..7d4e35a5 100755
--- a/scripts/makepkg
+++ b/scripts/makepkg
@@ -293,7 +293,7 @@ usage() {
ARGLIST=$@
-#Source user-specific makepkg.conf overrides
+#Source makepkg.conf; fail if it is not found
if [ -f /etc/makepkg.conf ]; then
source /etc/makepkg.conf
else
@@ -303,7 +303,7 @@ fi
#Source user-specific makepkg.conf overrides
if [ -f ~/.makepkg.conf ]; then
- source ~/.makepkg.conf
+ source ~/.makepkg.conf
fi
while [ "$#" -ne "0" ]; do
@@ -494,7 +494,7 @@ msg "Making package: $pkgname $pkgver-$pkgrel ($(date))"
unset deplist makedeplist
# fix flyspray bug #5973
-if [ "$NODEPS" = "1" -o "$GENINTEG" = "1" -o "$NOBUILD" = "1" ]; then
+if [ "$NODEPS" = "1" -o "$GENINTEG" = "1" -o "$NOBUILD" = "1" -o "$REPKG" = "1" ]; then
warning "skipping dependecy checks"
elif [ $(type -p pacman) ]; then
msg "Checking Runtime Dependencies..."