diff options
| author |   Jernej Jakob <jernej.jakob+gentoo@gmail.com> | 2022-06-07 15:44:35 +0200 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2023-01-14 16:39:33 +0000 |
| commit | e0dab1a94fe74e2f42a32f3e658ffa877a9241d6 (patch) | |
| tree | b9abff052b12807d3276052f1f3bf4dada5da94f | |
| parent | emerge: add support for --deselect (diff) | |
| download | gentoo-bashcomp-e0dab1a94fe74e2f42a32f3e658ffa877a9241d6.tar.gz gentoo-bashcomp-e0dab1a94fe74e2f42a32f3e658ffa877a9241d6.tar.bz2 gentoo-bashcomp-e0dab1a94fe74e2f42a32f3e658ffa877a9241d6.zip | |
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@gentoo.org>
| -rw-r--r-- | helpers/gentoo-common.sh | 4 |
1 files 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 |