[gentoo-commits] proj/eselect:master commit in: /, libs/

[gentoo-commits] proj/eselect:master commit in: /, libs/

[Ulrich Müller]

commit:     c7e76fc0b9add97eda8cf406cbd168a1997e9ae3
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 14 14:23:07 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 14 16:54:40 2023 +0000
URL:        https://gitweb.gentoo.org/proj/eselect.git/commit/?id=c7e76fc0

Allow to specify modules by path

* libs/core.bash.in (find_module): Allow to specify an absolute
path as the module's filename.

Bug: https://bugs.gentoo.org/901205
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 ChangeLog         |  5 +++++
 libs/core.bash.in | 11 ++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index aab936d..57a53fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-03-14  Florian Schmaus  <flow@gentoo.org>
+
+	* libs/core.bash.in (find_module): Allow to specify an absolute
+	path as the module's filename.
+
 2023-02-28  Ulrich Müller  <ulm@gentoo.org>
 
 	* bin/eselect.in: Disable colours if NO_COLOR is nonempty.

diff --git a/libs/core.bash.in b/libs/core.bash.in
index 740354e..2800cc5 100644
--- a/libs/core.bash.in
+++ b/libs/core.bash.in
@@ -1,5 +1,5 @@
 # -*-eselect-*-  vim: ft=eselect
-# Copyright (c) 2005-2020 Gentoo Authors
+# Copyright (c) 2005-2023 Gentoo Authors
 #
 # This file is part of the 'eselect' tools framework.
 #
@@ -69,6 +69,15 @@ die() {
 # Find module and echo its filename. Die if module doesn't exist.
 find_module() {
 	local modname=$1 modpath
+
+	if [[ ${modname} == */* ]]; then
+		if [[ ${modname} == *.eselect && -f ${modname} ]]; then
+			echo "${modname}"
+			return
+		fi
+		die -q "Can't load module ${modname}"
+	fi
+
 	for modpath in "${ESELECT_MODULES_PATH[@]}"; do
 		if [[ -f ${modpath}/${modname}.eselect ]]; then
 			echo "${modpath}/${modname}.eselect"

[gentoo-commits] proj/eselect:master commit in: /, libs/

[Ulrich Müller]

commit:     a49477f39d3f000cc2ca57f18aafbd66656aba05
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 24 12:13:08 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 24 12:13:08 2021 +0000
URL:        https://gitweb.gentoo.org/proj/eselect.git/commit/?id=a49477f3

Recognise loongarch*/loong in package-manager lib

* libs/package-manager.bash.in (arch): Recognise loongarch*/loong.

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 ChangeLog                    | 4 ++++
 libs/package-manager.bash.in | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index dfdfe47..f2ea0b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2021-08-24  Ulrich Müller  <ulm@gentoo.org>
+
+	* libs/package-manager.bash.in (arch): Recognise loongarch*/loong.
+
 2021-02-17  Ulrich Müller  <ulm@gentoo.org>
 
 	* modules/news.eselect (do_list): Recognise "new" and "all"

diff --git a/libs/package-manager.bash.in b/libs/package-manager.bash.in
index 35a1e11..c32fcb4 100644
--- a/libs/package-manager.bash.in
+++ b/libs/package-manager.bash.in
@@ -1,5 +1,5 @@
 # -*-eselect-*-  vim: ft=eselect
-# Copyright (c) 2005-2020 Gentoo Authors
+# Copyright (c) 2005-2021 Gentoo Authors
 #
 # This file is part of the 'eselect' tools framework.
 #
@@ -76,6 +76,7 @@ arch() {
 			hppa*)  	ret=hppa	;;
 			i?86)   	ret=x86 	;;
 			ia64*)  	ret=ia64	;;
+			loongarch*)	ret=loong	;;
 			m68k*)  	ret=m68k	;;
 			mips*)  	ret=mips	;;
 			nios2)  	ret=nios2	;;

[gentoo-commits] proj/eselect:master commit in: /, libs/

[Ulrich Müller]

commit:     50fd0e9ae91c7d953278eaba90716e7f5fa4ebb4
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 13 20:43:08 2019 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 13 20:43:08 2019 +0000
URL:        https://gitweb.gentoo.org/proj/eselect.git/commit/?id=50fd0e9a

Output warning messages in yellow.

* libs/output.bash.in (colours): Display warning messages in
yellow, in order to distinguish from errors which are red.

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 ChangeLog           | 5 +++++
 libs/output.bash.in | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 84673d3..446cd31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2019-02-13  Ulrich Mueller  <ulm@gentoo.org>
+
+	* libs/output.bash.in (colours): Display warning messages in
+	yellow, in order to distinguish from errors which are red.
+
 2018-12-22  Ulrich Mueller  <ulm@gentoo.org>
 
 	* modules/profile.eselect (set_symlink): Warn about deprecated

diff --git a/libs/output.bash.in b/libs/output.bash.in
index 2d32bc6..2f6fc02 100644
--- a/libs/output.bash.in
+++ b/libs/output.bash.in
@@ -20,8 +20,8 @@ colours() {
 		COLOUR_NORMAL=$(tput sgr0)
 		COLOUR_BOLD=$(tput bold)
 		COLOUR_HI=$(tput setaf 4)${COLOUR_BOLD} # blue
-		COLOUR_WARN=$(tput setaf 1)${COLOUR_BOLD} # red
-		COLOUR_ERROR=${COLOUR_WARN}
+		COLOUR_WARN=$(tput setaf 3)${COLOUR_BOLD} # yellow
+		COLOUR_ERROR=$(tput setaf 1)${COLOUR_BOLD} # red
 		COLOUR_LIST_HEADER=$(tput setaf 2)${COLOUR_BOLD} # green
 		COLOUR_LIST_LEFT=${COLOUR_BOLD}
 		COLOUR_LIST_RIGHT=${COLOUR_NORMAL}

[gentoo-commits] proj/eselect:master commit in: /, libs/

[Ulrich Müller]

commit:     95b7bee70378a6fcbf838301f2f98e8825544c22
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 23 12:43:39 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 23 12:51:42 2018 +0000
URL:        https://gitweb.gentoo.org/proj/eselect.git/commit/?id=95b7bee7

Update arch list in package-manager list.

* libs/package-manager.bash.in (arch): Restore sparc64 which was
lost in a previous update. Sync with arch.list in the gentoo repo.

 ChangeLog                    |  5 +++++
 libs/package-manager.bash.in | 34 +++++++++++++++++-----------------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 398b23c..3846850 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-01-23  Ulrich Müller  <ulm@gentoo.org>
+
+	* libs/package-manager.bash.in (arch): Restore sparc64 which was
+	lost in a previous update. Sync with arch.list in the gentoo repo.
+
 2018-01-09  Ulrich Müller  <ulm@gentoo.org>
 
 	* configure.ac: Update version to 1.4.11.

diff --git a/libs/package-manager.bash.in b/libs/package-manager.bash.in
index baf49df..220e09c 100644
--- a/libs/package-manager.bash.in
+++ b/libs/package-manager.bash.in
@@ -70,23 +70,23 @@ arch() {
 		# Try to determine arch from HOSTTYPE and OSTYPE, which are
 		# derived from the GNU triplet (at build time of bash)
 		case ${HOSTTYPE} in
-			aarch64*)	ret=arm64		;;
-			alpha*) 	ret=alpha		;;
-			arm*)   	ret=arm 		;;
-			hppa*)  	ret=hppa		;;
-			i?86)   	ret=x86 		;;
-			ia64*)  	ret=ia64		;;
-			m68k*)  	ret=m68k		;;
-			mips*)  	ret=mips		;;
-			nios2)  	ret=nios2		;;
-			or1k|or32*)	ret=openrisc	;;
-			powerpc64*)	ret=ppc64		;;
-			powerpc*)	ret=ppc 		;;
-			riscv*) 	ret=riscv		;;
-			s390*)  	ret=s390		;;
-			sh*)    	ret=sh  		;;
-			sparc*) 	ret=sparc		;;
-			x86_64) 	ret=amd64		;;
+			aarch64*)  	ret=arm64 	;;
+			alpha*) 	ret=alpha	;;
+			arm*)   	ret=arm 	;;
+			hppa*)  	ret=hppa	;;
+			i?86)   	ret=x86 	;;
+			ia64*)  	ret=ia64	;;
+			m68k*)  	ret=m68k	;;
+			mips*)  	ret=mips	;;
+			nios2)  	ret=nios2	;;
+			powerpc64*)	ret=ppc64	;;
+			powerpc*)	ret=ppc 	;;
+			riscv*) 	ret=riscv	;;
+			s390*)  	ret=s390	;;
+			sh*)    	ret=sh  	;;
+			sparc64*) 	ret=sparc64	;;
+			sparc*) 	ret=sparc	;;
+			x86_64) 	ret=amd64	;;
 			*)
 				write_warning_msg \
 					"Unknown architecture \"${HOSTTYPE}\"." \

[gentoo-commits] proj/eselect:master commit in: /, libs/

[Ulrich Müller]

commit:     1b4e2608f7463d98270c0b709cffe09d1b5d2d86
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 31 08:30:55 2016 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 31 08:30:55 2016 +0000
URL:        https://gitweb.gentoo.org/proj/eselect.git/commit/?id=1b4e2608

Disable eval again.

* libs/core.bash.in (eval): Disable eval again, because the
workaround for the rc module (sourcing functions.sh) is no longer
needed. See also 2005-05-15 change by ciaranm.

This partially reverts commit 76867bf1a47570cd9548100caed519252b5ced5a.

 ChangeLog         | 6 ++++++
 README            | 2 +-
 libs/core.bash.in | 6 +++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c7a54f6..80bc483 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-10-31  Ulrich Müller  <ulm@gentoo.org>
+
+	* libs/core.bash.in (eval): Disable eval again, because the
+	workaround for the rc module (sourcing functions.sh) is no longer
+	needed. See also 2005-05-15 change by ciaranm.
+
 2016-10-30  Ulrich Müller  <ulm@gentoo.org>
 
 	* configure.ac: Update version to 1.4.7.

diff --git a/README b/README
index 945dc41..de19882 100644
--- a/README
+++ b/README
@@ -34,7 +34,7 @@ Style Notes
   one tab per indent level, with each tab representing 4 places.
 * Avoid lines wider than 79 positions.
 * Public functions don't get the ``es_`` prefix, private functions do.
-* eval is evil, so don't use it.
+* eval is evil, so we disabled it.
 * Absolute paths to executables are not portable, so don't use them.
 
 \f

diff --git a/libs/core.bash.in b/libs/core.bash.in
index baddfde..4418d51 100644
--- a/libs/core.bash.in
+++ b/libs/core.bash.in
@@ -119,7 +119,11 @@ inherit() {
 	done
 }
 
-# GNU sed wrapper (sed or gsed, as determined by configure)
+# make eval not work, because it's evil
+eval() {
+	die "Don't use eval. Find another way."
+}
+
 sed() {
 	command @SED@ "$@"
 }