From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Shy8b-0001FU-G2 for garchives@archives.gentoo.org; Fri, 22 Jun 2012 07:18:37 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0CC90E0CB8; Fri, 22 Jun 2012 07:18:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D3E22E0CB8 for ; Fri, 22 Jun 2012 07:18:27 +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 1225D1B4019 for ; Fri, 22 Jun 2012 07:18:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 1A021E5435 for ; Fri, 22 Jun 2012 07:18:25 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1340349491.003e95562216045408d8d2dd09afeac2311383fc.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: 003e95562216045408d8d2dd09afeac2311383fc X-VCS-Branch: master Date: Fri, 22 Jun 2012 07:18:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 64a445e3-0979-4840-b578-17d02176346c X-Archives-Hash: 8b3ab18507d8b280121b136925d64a65 commit: 003e95562216045408d8d2dd09afeac2311383fc Author: Zac Medico gentoo org> AuthorDate: Fri Jun 22 07:18:11 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Jun 22 07:18:11 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D003e9556 getportageversion: handle repo: in parent file --- pym/_emerge/actions.py | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index a689b7b..7ad28e6 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -2807,6 +2807,7 @@ def relative_profile_path(portdir, abs_profile): =20 def getportageversion(portdir, _unused, profile, chost, vardb): profilever =3D None + repositories =3D vardb.settings.repositories if profile: profilever =3D relative_profile_path(portdir, profile) if profilever is None: @@ -2817,6 +2818,20 @@ def getportageversion(portdir, _unused, profile, c= host, vardb): os.path.join(profile, parent)) if profilever is not None: break + colon =3D parent.find(":") + if colon !=3D -1: + p_repo_name =3D parent[:colon] + try: + p_repo_loc =3D \ + repositories.get_location_for_name(p_repo_name) + except KeyError: + pass + else: + profilever =3D relative_profile_path(p_repo_loc, + os.path.join(p_repo_loc, 'profiles', + parent[colon+1:])) + if profilever is not None: + break except portage.exception.PortageException: pass =20