diff options
| author |   Paul Varner <fuzzyray@gentoo.org> | 2012-09-26 01:12:13 -0500 |
|---|---|---|
| committer | Paul Varner <fuzzyray@gentoo.org> | 2012-09-26 01:12:13 -0500 |
| commit | 2ab755734b81867c6139278c65a1765b1b642c76 (patch) | |
| tree | 7ac5e4e4df669fdde11fc9c319ea1415b0c1f028 | |
| parent | Remove check of isatty when guessing color. (diff) | |
| download | gentoolkit-2ab755734b81867c6139278c65a1765b1b642c76.tar.gz gentoolkit-2ab755734b81867c6139278c65a1765b1b642c76.tar.bz2 gentoolkit-2ab755734b81867c6139278c65a1765b1b642c76.zip | |
Fix euse to always prefer /etc/portage/make.conf over /etc/make.conf. Bug 434672
| -rwxr-xr-x | bin/euse | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -35,11 +35,9 @@ warn() { echo -e "WARNING: ${*}" } -# /etc/make.conf can now exist in /etc/portage/make.conf, prefer it over -# /etc/make.conf for changes. Since this will only be used for modifying -# the USE variable, we need to make sure the one we pick is the one with -# the USE variable defined. -if [[ -n $(grep '^USE="' "${ETC}/portage/make.conf" 2>/dev/null) ]]; then +# /etc/make.conf now exists as /etc/portage/make.conf by default, prefer +# it over /etc/make.conf for changes. +if [[ -e "${ETC}/portage/make.conf" ]]; then MAKE_CONF_PATH="${ETC}/portage/make.conf" elif [[ -e "${ETC}/make.conf" ]]; then MAKE_CONF_PATH="${ETC}/make.conf" |