Merge changes from trunk to fix issues in 0.2.4

svn path=/branches/gentoolkit-0.2.4/; revision=516

diff --git a/ChangeLog b/ChangeLog
index aa1c6e8c2e01b4e4b954d0daaa06214e73e94318..2e138337de39c29a837f3e2ae8280296a71382e2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 ed70932e0a7e9f751e40f2c57a68f8c021949ca8..74007092b1ac7997eb23277244cd0e6390712ace 100755 (executable)
--- 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"
 }