bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

makepkg: only source user override if using default config file

Browse source 
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>
This commit is contained in:
Dan McGee 2011-06-28 21:35:48 -05:00
parent 4c80f994c3
commit c2e6a01a28
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scripts/makepkg.sh.in
View file

@ -1829,8 +1829,9 @@ else
exit 1 # $E_CONFIG_ERROR exit 1 # $E_CONFIG_ERROR
fi fi
# Source user-specific makepkg.conf overrides # Source user-specific makepkg.conf overrides, but only if no override config
if [[ -r ~/.makepkg.conf ]]; then # file was specified
if [[ $MAKEPKG_CONF = "$confdir/makepkg.conf" && -r ~/.makepkg.conf ]]; then
source ~/.makepkg.conf source ~/.makepkg.conf
fi fi