From c2e6a01a2897e13849e2cdc8291d862d4ea0ee44 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 28 Jun 2011 21:35:48 -0500 Subject: makepkg: only source user override if using default config file Otherwise there is no way to easily test or run with a standalone config file without outside interference. Signed-off-by: Dan McGee --- scripts/makepkg.sh.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 43bed72b..10272b38 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1829,8 +1829,9 @@ else exit 1 # $E_CONFIG_ERROR fi -# Source user-specific makepkg.conf overrides -if [[ -r ~/.makepkg.conf ]]; then +# Source user-specific makepkg.conf overrides, but only if no override config +# file was specified +if [[ $MAKEPKG_CONF = "$confdir/makepkg.conf" && -r ~/.makepkg.conf ]]; then source ~/.makepkg.conf fi -- cgit v1.2.3