From 1bab946c5ca62db1d233997e2ee81e13c56c9198 Mon Sep 17 00:00:00 2001 From: fuzzyray Date: Wed, 17 Sep 2008 18:20:16 +0000 Subject: [PATCH] Fix check_sanity function to use get_all_make_defaults function when checking for the make.defaults files in the profile. (Bug #233651) svn path=/; revision=515 --- trunk/ChangeLog | 5 +++++ trunk/src/euse/euse | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/trunk/ChangeLog b/trunk/ChangeLog index aa1c6e8..2e13833 100644 --- a/trunk/ChangeLog +++ b/trunk/ChangeLog @@ -1,3 +1,8 @@ +2008-09-17: Paul Varner + * euse: Fix check_sanity function to use get_all_make_defaults + function when checking for the make.defaults files in the profile. + (Bug #233651) + 2008-09-03: Paul Varner * equery: Fix depgraph function to print out dependencies that don't resolve to a package (Bug #236492) diff --git a/trunk/src/euse/euse b/trunk/src/euse/euse index ed70932..7400709 100755 --- a/trunk/src/euse/euse +++ b/trunk/src/euse/euse @@ -67,6 +67,7 @@ get_real_path() { check_sanity() { # file permission tests local descdir + local make_defaults descdir="$(get_portdir)/profiles" @@ -77,7 +78,10 @@ check_sanity() { [ ! -d "${descdir}" ] && error "${descdir} does not exist or is not a directory" [ ! -r "${descdir}/use.desc" ] && error "${descdir}/use.desc is not readable" [ ! -r "${descdir}/use.local.desc" ] && error "${descdir}/use.local.desc is not readable" - [ ! -r "$(get_make_defaults)" ] && error "$(get_make_defaults) is not readable" + for make_defaults in $(get_all_make_defaults); do + [ ! -r "$make_defaults" ] && error "$_make_defaults is not readable" + done +# [ ! -r "$(get_make_defaults)" ] && error "$(get_make_defaults) is not readable" [ "${MODE}" == "modify" -a ! -w "${MAKE_CONF_PATH}" ] && error ""${MAKE_CONF_PATH}" is not writable" } -- 2.26.2