From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 24 Jun 2006 04:14:38 +0000 (-0000)
Subject: Fix getgccversion logic for bug #137786.
X-Git-Tag: v2.1.1~405
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6a011e30ec390e479ef86c948c42817bad621901;p=portage.git

Fix getgccversion logic for bug #137786.

svn path=/main/trunk/; revision=3632
---

diff --git a/bin/emerge b/bin/emerge
index e0a4b4ef3..1ba7e9e28 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -269,7 +269,7 @@ def format_size(mysize):
 	return mystr+" kB"
 
 
-def getgccversion():
+def getgccversion(chost):
 	"""
 	rtype: C{str}
 	return:  the current in-use gcc version
@@ -287,15 +287,15 @@ def getgccversion():
 	mystatus, myoutput = commands.getstatusoutput("eselect compiler show")
 	if mystatus == os.EX_OK and len(myoutput.split("/")) == 2:
 		part1, part2 = myoutput.split("/")
-		if len(part1.split("-")) > 0:
-			return gcc_ver_prefix + part1.split("-")[-1] + "/" + part2
+		if part1.startswith(chost + "-"):
+			return myoutput.replace(chost + "-", gcc_ver_prefix, 1)
 
 	mystatus, myoutput = commands.getstatusoutput("gcc-config -c")
 	if mystatus == os.EX_OK and len(myoutput.split("-")) > 0:
 		return gcc_ver_prefix + myoutput.split("-")[-1]
 
 	mystatus, myoutput = commands.getstatusoutput(
-		portage.settings["CHOST"] + "-" + gcc_ver_command)
+		chost + "-" + gcc_ver_command)
 	if mystatus == os.EX_OK:
 		return gcc_ver_prefix + myoutput
 
@@ -331,7 +331,7 @@ def getportageversion():
 	if libcver==[]:
 		libcver="unavailable"
 
-	gccver = getgccversion()
+	gccver = getgccversion(portage.settings["CHOST"])
 	unameout=os.uname()[2]+" "+os.uname()[4]
 
 	return "Portage " + portage.VERSION +" ("+profilever+", "+gccver+", "+libcver+", "+unameout+")"