From: Paul Varner <fuzzyray@gentoo.org>
Date: Wed, 26 Sep 2012 06:12:13 +0000 (-0500)
Subject: Fix euse to always prefer /etc/portage/make.conf over /etc/make.conf. Bug 434672
X-Git-Tag: gentoolkit-0.3.0.7~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2ab755734b81867c6139278c65a1765b1b642c76;p=gentoolkit.git

Fix euse to always prefer /etc/portage/make.conf over /etc/make.conf. Bug 434672
---

diff --git a/bin/euse b/bin/euse
index 3b7556f..1279a2c 100755
--- a/bin/euse
+++ b/bin/euse
@@ -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"