diff options
author | fuzzyray <fuzzyray@gentoo.org> | 2010-11-23 17:26:38 +0000 |
---|---|---|
committer | fuzzyray <fuzzyray@gentoo.org> | 2010-11-23 17:26:38 +0000 |
commit | 13913c8f0b2fd1de179999bad5c24f3f6a8a0945 (patch) | |
tree | 8e6b8f8d1f59e6af735124d5bc191db3a67c9559 | |
parent | Fix cpv.py to handle prefix ebuild inter-revisions. Bug 313295 (diff) | |
download | gentoolkit-13913c8f0b2fd1de179999bad5c24f3f6a8a0945.tar.gz gentoolkit-13913c8f0b2fd1de179999bad5c24f3f6a8a0945.tar.bz2 gentoolkit-13913c8f0b2fd1de179999bad5c24f3f6a8a0945.zip |
Update euse to look for /etc/portage/make.conf as well as /etc/make.conf. Bug 346519
svn path=/trunk/gentoolkit/; revision=866
-rwxr-xr-x | bin/euse | 21 |
1 files changed, 14 insertions, 7 deletions
@@ -9,7 +9,20 @@ PROGRAM_NAME=euse VERSION="svn" -MAKE_CONF_PATH=/etc/make.conf +error() { + echo "ERROR: ${1}" + set +f + exit 1 +} + +# Portage now supports make.conf in /etc and /etc/portage +if [ -r /etc/make.conf ]; then + MAKE_CONF_PATH=/etc/make.conf +elif [ -r /etc/portage/make.conf ]; then + MAKE_CONF_PATH=/etc/portage/make.conf +else + error "make.conf file is not readable" +fi MAKE_GLOBALS_PATH=/etc/make.globals MAKE_PROFILE_PATH=/etc/make.profile MAKE_CONF_BACKUP_PATH=/etc/make.conf.euse_backup @@ -49,12 +62,6 @@ parse_arguments() { done } -error() { - echo "ERROR: ${1}" - set +f - exit 1 -} - get_real_path() { set -P cd "$1" |