From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3565A138010 for ; Fri, 26 Oct 2012 17:47:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BB40521C028; Fri, 26 Oct 2012 17:47:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 40D0521C028 for ; Fri, 26 Oct 2012 17:47:00 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9AB4D33D937 for ; Fri, 26 Oct 2012 17:46:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 3AC6FE5436 for ; Fri, 26 Oct 2012 17:46:58 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1351273554.4126fcfb04efcedaf857b0f6977effb82c24e1cb.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/actions.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 4126fcfb04efcedaf857b0f6977effb82c24e1cb X-VCS-Branch: master Date: Fri, 26 Oct 2012 17:46:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c30ae1a8-b95d-4081-92b5-70132623a87d X-Archives-Hash: 531def6041b01a507190e47673d7ee57 commit: 4126fcfb04efcedaf857b0f6977effb82c24e1cb Author: Zac Medico gentoo org> AuthorDate: Fri Oct 26 17:45:54 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Oct 26 17:45:54 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=4126fcfb emerge --info: show linker version, bug #436294 --- pym/_emerge/actions.py | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index fec2dfa..2b3e57e 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -1361,6 +1361,7 @@ def action_info(settings, trees, myopts, myfiles): append = output_buffer.append root_config = trees[settings['EROOT']]['root_config'] running_eroot = trees._running_eroot + chost = settings.get("CHOST") append(getportageversion(settings["PORTDIR"], None, settings.profile_path, settings["CHOST"], @@ -1382,6 +1383,23 @@ def action_info(settings, trees, myopts, myfiles): lastSync = "Unknown" append("Timestamp of tree: %s" % (lastSync,)) + ld_names = [] + if chost: + ld_names.append(chost + "-ld") + ld_names.append("ld") + for name in ld_names: + try: + proc = subprocess.Popen([name, "--version"], + stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + except OSError: + pass + else: + output = _unicode_decode(proc.communicate()[0]).splitlines() + proc.wait() + if proc.wait() == os.EX_OK and output: + append("ld %s" % (output[0])) + break + try: proc = subprocess.Popen(["distcc", "--version"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)