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

["Ulrich Mueller" <ulm@gentoo.org>]

commit:     6cf0931afd8a47eebd1b8f9fefe33327957c41a1
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 17 15:25:42 2013 +0000
Commit:     Ulrich Mueller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 17 15:25:42 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/eselect.git;a=commit;h=6cf0931a

Workaround for ARCH in prefix/linux profiles, bug 473542.

* libs/package-manager.bash.in (arch): Workaround for incorrect
definition of ARCH in prefix/linux profiles, bug 473542.

---
 ChangeLog                    |  5 +++++
 libs/package-manager.bash.in | 13 +++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 90c86c7..ba6c4f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-17  Ulrich Müller  <ulm@gentoo.org>
+
+	* libs/package-manager.bash.in (arch): Workaround for incorrect
+	definition of ARCH in prefix/linux profiles, bug 473542.
+
 2013-04-06  Ulrich Müller  <ulm@gentoo.org>
 
 	* doc/developer-guide.txt: Document the "unset" action; it is used

diff --git a/libs/package-manager.bash.in b/libs/package-manager.bash.in
index 886e3b7..7cf31b5 100644
--- a/libs/package-manager.bash.in
+++ b/libs/package-manager.bash.in
@@ -44,6 +44,19 @@ run_paludis() {
 arch() {
 	local ret=$(envvar sys-devel/gcc ARCH)
 
+	if [[ -n ${EPREFIX} && -n ${ret} && ${ret%-*} = "${ret}" ]]; then
+		# prefix/linux profiles lie about their ARCH
+		case $(envvar sys-devel/gcc KERNEL) in
+			linux) ret+="-linux" ;;
+			*)
+				write_warning_msg \
+					"Failed to determine \${ARCH}." \
+					"Please submit a bug report."
+				return 1
+				;;
+		esac
+	fi
+
 	# $arch will be null if there's no current make.profile symlink.
 	# We cannot get a list of valid profiles without it.
 	if [[ -z ${ret} ]]; then