From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-603624-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8BEC31381F3 for <garchives@archives.gentoo.org>; Sat, 29 Jun 2013 04:22:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 13426E08BA; Sat, 29 Jun 2013 04:22:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9A350E08BA for <gentoo-commits@lists.gentoo.org>; Sat, 29 Jun 2013 04:22:02 +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 5C31E33E7E2 for <gentoo-commits@lists.gentoo.org>; Sat, 29 Jun 2013 04:22:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id DCC22E468F for <gentoo-commits@lists.gentoo.org>; Sat, 29 Jun 2013 04:21:59 +0000 (UTC) From: "Zac Medico" <zmedico@gentoo.org> 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" <zmedico@gentoo.org> Message-ID: <1372479698.1b4a808ebcb93fe559cced7b270263bbfd4c6594.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/repoman X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 1b4a808ebcb93fe559cced7b270263bbfd4c6594 X-VCS-Branch: master Date: Sat, 29 Jun 2013 04:21:59 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 795c011f-8feb-4a41-9e78-c6527b57fd3e X-Archives-Hash: c27bcc19d2f3f5198c0c0fccbb62b209 commit: 1b4a808ebcb93fe559cced7b270263bbfd4c6594 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Sat Jun 29 04:21:38 2013 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Sat Jun 29 04:21:38 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=1b4a808e repoman: fix PORTDIR{,_OVERLAY} interference Ensure that the repository corresponding to $PWD overrides a repository of the same name referenced by the existing PORTDIR or PORTDIR_OVERLAY settings (broken since commit eab5b86c2d45765ea718e1e9488dde43c9bbac7e). --- bin/repoman | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/bin/repoman b/bin/repoman index faf0232..e31f699 100755 --- a/bin/repoman +++ b/bin/repoman @@ -595,6 +595,12 @@ except KeyError: [%s] location = %s """) % (repo_name, portdir_overlay)) + # Ensure that the repository corresponding to $PWD overrides a + # repository of the same name referenced by the existing PORTDIR + # or PORTDIR_OVERLAY settings. + repoman_settings['PORTDIR_OVERLAY'] = "%s %s" % \ + (repoman_settings.get('PORTDIR_OVERLAY', ''), + portage._shell_quote(portdir_overlay)) repositories = portage.repository.config.RepoConfigLoader([repos_conf_file, tmp_conf_file], repoman_settings) # We have to call the config constructor again so that attributes # dependent on config.repositories are initialized correctly.