From f104023999c1f2ebd1034ee4925e95b30ba16ff2 Mon Sep 17 00:00:00 2001
From: Aaron Griffin <aaron@archlinux.org>
Date: Thu, 21 Dec 2006 20:03:41 +0000
Subject: * Dan McGee <dpmcgee@gmail.com>    Formating / comment changes    Fix
 dep check conditional

---
 scripts/makepkg | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'scripts/makepkg')

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..."
-- 
cgit v1.2.3-70-g09d2