diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2013-06-28 21:21:38 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2013-06-28 21:21:38 -0700 |
| commit | 1b4a808ebcb93fe559cced7b270263bbfd4c6594 (patch) | |
| tree | 2a5d6bba56127b111513d4f64d6831179b3e37f9 | |
| parent | RepoConfigLoader: support repos.conf directory (diff) | |
| download | portage-2.2.0_alpha186.tar.gz portage-2.2.0_alpha186.tar.bz2 portage-2.2.0_alpha186.zip | |
repoman: fix PORTDIR{,_OVERLAY} interferencev2.2.0_alpha186
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).
| -rwxr-xr-x | bin/repoman | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/bin/repoman b/bin/repoman index faf023248..e31f69924 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. |