commit:     e8c39ce15595d76671565911e115f1dcd890c18d
Author:     muesli <muesli4brekkies <AT> gmail <DOT> com>
AuthorDate: Fri Aug 29 23:22:41 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 11 05:19:11 2025 +0000
URL:        https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=e8c39ce1

euse: handle make.conf as dir

euse echoes /etc/make.conf and /etc/portage/make.conf back if they
exist.

This misses /etc/portage/make.conf/* if it is a dir, and
causes euse to attempt to source a dir, throwing an error.

This PR;
- adds /etc/portage/make.conf/* to the list
- checks if they're files with -f  before echoing back

Closes: https://bugs.gentoo.org/962148
Part-of: https://github.com/gentoo/gentoolkit/pull/58
Closes: https://github.com/gentoo/gentoolkit/pull/58
Signed-off-by: Sam James <sam <AT> gentoo.org>

 bin/euse | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/euse b/bin/euse
index 369252b..c706102 100755
--- a/bin/euse
+++ b/bin/euse
@@ -427,8 +427,8 @@ get_useflaglist_ebuild() {
 # get all make.conf files that exist on the system
 get_all_make_conf() {
        # At least one of the files exists or we would not have made it this far
-       for x in ${ETC}/make.conf ${ETC}/portage/make.conf; do
-               [ -e "${x}" ] && echo "${x}"
+       for x in ${ETC}/make.conf ${ETC}/portage/make.conf 
${ETC}/portage/make.conf/*; do
+               [ -f "${x}" ] && echo "${x}"
        done
 }
 # Function: traverse_profile {{{

Reply via email to