commit: e0dab1a94fe74e2f42a32f3e658ffa877a9241d6
Author: Jernej Jakob <jernej.jakob+gentoo <AT> gmail <DOT> com>
AuthorDate: Tue Jun 7 13:44:35 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 14 16:39:33 2023 +0000
URL:
https://gitweb.gentoo.org/proj/gentoo-bashcomp.git/commit/?id=e0dab1a9
Revert "ignore non conf files in /etc/portage/repos.conf."
This reverts commit f3f401b1166bb3d7f79b9f3cb8ebfc3527cd4394.
The commit introduced behavior that was not consistent with portage,
which parses all files in the repos.conf directory not starting with
'.' or ending with '~', regardless if they end with '.conf' or not.
Signed-off-by: Sam James <sam <AT> gentoo.org>
helpers/gentoo-common.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/helpers/gentoo-common.sh b/helpers/gentoo-common.sh
index 9424ad6..6e8d51c 100644
--- a/helpers/gentoo-common.sh
+++ b/helpers/gentoo-common.sh
@@ -7,7 +7,7 @@
# Retrieve PORTDIR/PORTDIR_OVERLAY location.
#
# In order of highest to lowest priority:
-# /etc/portage/repos.conf{,/*.conf}
+# /etc/portage/repos.conf{,/*}
# /usr/share/portage/config/repos.conf
# /etc/portage/make.conf
# /etc/make.conf
@@ -65,7 +65,7 @@ _parsereposconf() {
for f in @GENTOO_PORTAGE_EPREFIX@/usr/share/portage/config/repos.conf \
@GENTOO_PORTAGE_EPREFIX@/etc/portage/repos.conf \
- @GENTOO_PORTAGE_EPREFIX@/etc/portage/repos.conf/*.conf; do
+ @GENTOO_PORTAGE_EPREFIX@/etc/portage/repos.conf/*; do
[[ -f ${f} ]] || continue
insection=0
