Otherwise there is no way to easily test or run with a standalone config file without outside interference. Signed-off-by: Dan McGee <dan@archlinux.org> --- scripts/makepkg.sh.in | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 43bed72..10272b3 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 -- 1.7.6