From: idl0r Date: Sun, 11 Apr 2010 18:07:15 +0000 (-0000) Subject: euse: Fix check for /etc/make.profile. X-Git-Tag: gentoolkit-0.3.0_rc11~41 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=139c622d4ca95eb219ea4657abb5f6dd0813377e;p=gentoolkit.git euse: Fix check for /etc/make.profile. Check if its readable and a directory instead of checking if its a link, thanks to Phillip Brink (ohnobinki) . svn path=/trunk/gentoolkit/; revision=772 --- diff --git a/ChangeLog b/ChangeLog index 0c5e3e2..9b9e0cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-04-11: Christian Ruppert + * euse: Fix check for /etc/make.profile, check if its readable and a + directory instead of checking if its a link. Thanks to Phillip Brink + (ohnobinki) . + 2010-04-06: Christian Ruppert * euse: Fix query to get USE, bug 181309, thanks to Jean-Baptiste Rouault . diff --git a/bin/euse b/bin/euse index 023bfe4..ab8b932 100755 --- a/bin/euse +++ b/bin/euse @@ -68,11 +68,12 @@ check_sanity() { local descdir local make_defaults + [[ ! -d "${MAKE_PROFILE_PATH}" || ! -r "${MAKE_PROFILE_PATH}" ]] && error "${MAKE_PROFILE_PATH} is not readable" + descdir="$(get_portdir)/profiles" [ ! -r "${MAKE_CONF_PATH}" ] && error "${MAKE_CONF_PATH} is not readable" [ ! -r "${MAKE_GLOBALS_PATH}" ] && error "${MAKE_GLOBALS_PATH} is not readable" - [ ! -h "${MAKE_PROFILE_PATH}" ] && error "${MAKE_PROFILE_PATH} is not a symlink" [ -z "$(get_portdir)" ] && error "\$PORTDIR couldn't be determined" [ ! -d "${descdir}" ] && error "${descdir} does not exist or is not a directory" [ ! -r "${descdir}/use.desc" ] && error "${descdir}/use.desc is not readable"