diff options
| author | Dan McGee <dan@archlinux.org> | 2011-06-29 04:35:48 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-06-30 17:29:49 +0200 |
| commit | c2e6a01a2897e13849e2cdc8291d862d4ea0ee44 (patch) | |
| tree | d435e43c6b58ecfa8f08713d0b09491166e650cd | |
| parent | 4c80f994c34a64f14c46befcf7dbc376276f53d4 (diff) | |
| download | pacman-c2e6a01a2897e13849e2cdc8291d862d4ea0ee44.tar.gz pacman-c2e6a01a2897e13849e2cdc8291d862d4ea0ee44.tar.xz | |
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 <dan@archlinux.org>
| -rw-r--r-- | 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 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 |