[gentoo-commits] proj/gentoo-bashcomp:master commit in: helpers/

[gentoo-commits] proj/gentoo-bashcomp:master commit in: helpers/

[Patrice Clement]

commit:     7052f3bab2abeb620733fff21b2809429bacc554
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 10 23:02:43 2019 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Feb 10 23:04:09 2019 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-bashcomp.git/commit/?id=7052f3ba

fix repos.conf files pattern matching.

Courtesy of Duncan <1i5t5.duncan <AT> cox.net>.

Closes: https://bugs.gentoo.org/562626
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 helpers/gentoo-common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helpers/gentoo-common.sh b/helpers/gentoo-common.sh
index c0be688..6e8d51c 100644
--- a/helpers/gentoo-common.sh
+++ b/helpers/gentoo-common.sh
@@ -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

[gentoo-commits] proj/gentoo-bashcomp:master commit in: helpers/

[Patrice Clement]

commit:     f3f401b1166bb3d7f79b9f3cb8ebfc3527cd4394
Author:     redneb <redneb <AT> gmx <DOT> com>
AuthorDate: Tue Nov 16 15:42:15 2021 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Nov 16 16:08:23 2021 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-bashcomp.git/commit/?id=f3f401b1

ignore non conf files in /etc/portage/repos.conf.

portage ignores any file in /etc/portage/repos.conf/ (when that is in
fact a directory) that does not have a name of the form "*.conf".

gentoo-bashcomp should emulate the behavior of portage. Otherwise you
might run into issues: e.g. if there is a backup of eselect-repo.conf
called eselect-repo.conf~ that contains references to a now removed
overlay, gentoo-bashcomp should not try to search for completions in the
now nonexistent repo directory

Closes: https://github.com/gentoo/gentoo-bashcomp/pull/5
Signed-off-by: Patrice Clement <monsieurp <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 6e8d51c..9424ad6 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{,/*}
+# /etc/portage/repos.conf{,/*.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/*; do
+        @GENTOO_PORTAGE_EPREFIX@/etc/portage/repos.conf/*.conf; do
 
         [[ -f ${f} ]] || continue
         insection=0

[gentoo-commits] proj/gentoo-bashcomp:master commit in: helpers/

[Sam James]

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

[gentoo-commits] proj/gentoo-bashcomp:master commit in: helpers/

[Sam James]

commit:     184a51233d05f7b45a3c3fc73782be600add6000
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:34 2023 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-bashcomp.git/commit/?id=184a5123

Ignore backup prefixed or suffixed files in repos.conf subdirectory.

Portage ignores any files starting with '.' or ending with '~' in
the repos.conf directory.

See 'portage.util' function '_recursive_basename_filter'.

Closes: https://bugs.gentoo.org/730624
Signed-off-by: Sam James <sam <AT> gentoo.org>

 helpers/gentoo-common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helpers/gentoo-common.sh b/helpers/gentoo-common.sh
index 6e8d51c..35b5946 100644
--- a/helpers/gentoo-common.sh
+++ b/helpers/gentoo-common.sh
@@ -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/*; do
+        @GENTOO_PORTAGE_EPREFIX@/etc/portage/repos.conf/[!.]*[!~]; do
 
         [[ -f ${f} ]] || continue
         insection=0

[gentoo-commits] proj/gentoo-bashcomp:master commit in: helpers/

[Sam James]

commit:     c9cef9f13fe0ab333c9348f4198cf1cee81d18ec
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 21 07:27:11 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 21 07:27:11 2024 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-bashcomp.git/commit/?id=c9cef9f1

helpers/gentoo-common.sh: fix whitespace

Signed-off-by: Sam James <sam <AT> gentoo.org>

 helpers/gentoo-common.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/helpers/gentoo-common.sh b/helpers/gentoo-common.sh
index 35b5946..f587be2 100644
--- a/helpers/gentoo-common.sh
+++ b/helpers/gentoo-common.sh
@@ -18,7 +18,7 @@
 # for PORTDIR and PORTDIR_OVERLAY.  While repos.conf overrides any value of
 # PORTDIR set in make.conf, PORTDIR_OVERLAY is incremental (combined across
 # available sources).
-# 
+#
 # This would be a hell of a lot simpler if we used portageq, but also about
 # 500 times slower.
 _portdir() {
@@ -32,7 +32,7 @@ _portdir() {
 
             source @GENTOO_PORTAGE_EPREFIX@/etc/make.conf 2>/dev/null
             source @GENTOO_PORTAGE_EPREFIX@/etc/portage/make.conf 2>/dev/null
-        
+
             overlaypath+=(${PORTDIR_OVERLAY})
 
             # strip out duplicates
@@ -52,9 +52,9 @@ _portdir() {
 
         echo "${PORTDIR}"
 
-        if [[ ${1} == -o ]]; then 
+        if [[ ${1} == -o ]]; then
             echo "${PORTDIR_OVERLAY}"
-        fi   
+        fi
     fi
 }
 
@@ -69,7 +69,7 @@ _parsereposconf() {
 
         [[ -f ${f} ]] || continue
         insection=0
-            
+
         while read -r line; do
             # skip comments and blank lines
             [[ -z ${line} || ${line} == '#'* ]] && continue