diff options
author | fuzzyray <fuzzyray@gentoo.org> | 2008-09-17 18:27:01 +0000 |
---|---|---|
committer | fuzzyray <fuzzyray@gentoo.org> | 2008-09-17 18:27:01 +0000 |
commit | af2fa15474ca9857aa3d3bf54e1f36a11acb291c (patch) | |
tree | 6d8f4b9698f05f3c9fcc0af9651f3ee81f7169b7 | |
parent | Merge changes from trunk to fix issues in 0.2.4 (diff) | |
download | gentoolkit-af2fa15474ca9857aa3d3bf54e1f36a11acb291c.tar.gz gentoolkit-af2fa15474ca9857aa3d3bf54e1f36a11acb291c.tar.bz2 gentoolkit-af2fa15474ca9857aa3d3bf54e1f36a11acb291c.zip |
Merge changes from trunk to fix issues in 0.2.4
svn path=/branches/gentoolkit-0.2.4/; revision=516
-rw-r--r-- | ChangeLog | 5 | ||||
-rwxr-xr-x | src/euse/euse | 6 |
2 files changed, 10 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2008-09-17: Paul Varner <fuzzyray@gentoo.org> + * 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 <fuzzyray@gentoo.org> * equery: Fix depgraph function to print out dependencies that don't resolve to a package (Bug #236492) diff --git a/src/euse/euse b/src/euse/euse index ed70932..7400709 100755 --- a/src/euse/euse +++ b/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" } |