| 1 |
commit: 1ab7562ec6027e5edd118e66a9e39d2353d8bc87 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 17 02:39:34 2015 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 21 23:42:45 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=1ab7562e |
| 7 |
|
| 8 |
repoman/repos.py: Fix a regression where the repo is not in repos.conf |
| 9 |
|
| 10 |
The regression was introduced when a variable was used to reduce the size of |
| 11 |
some long lines. The variable was not being reset after the repo was added, so |
| 12 |
the remaining code was looking at a stale config. |
| 13 |
It turned out the variable was a dupe of an already properly updated class wide |
| 14 |
one. |
| 15 |
|
| 16 |
Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org> |
| 17 |
|
| 18 |
pym/repoman/repos.py | 10 +++++----- |
| 19 |
1 file changed, 5 insertions(+), 5 deletions(-) |
| 20 |
|
| 21 |
diff --git a/pym/repoman/repos.py b/pym/repoman/repos.py |
| 22 |
index 700c064..de99fdf 100644 |
| 23 |
--- a/pym/repoman/repos.py |
| 24 |
+++ b/pym/repoman/repos.py |
| 25 |
@@ -30,12 +30,12 @@ class RepoSettings(object): |
| 26 |
self.repoman_settings = repoman_settings |
| 27 |
self.vcs_settings = vcs_settings |
| 28 |
|
| 29 |
- repoman_repos = self.repoman_settings.repositories |
| 30 |
+ self.repositories = self.repoman_settings.repositories |
| 31 |
|
| 32 |
# Ensure that current repository is in the list of enabled repositories. |
| 33 |
self.repodir = os.path.realpath(portdir_overlay) |
| 34 |
try: |
| 35 |
- repoman_repos.get_repo_for_location(self.repodir) |
| 36 |
+ self.repositories.get_repo_for_location(self.repodir) |
| 37 |
except KeyError: |
| 38 |
self._add_repo(config_root, portdir_overlay) |
| 39 |
|
| 40 |
@@ -47,15 +47,15 @@ class RepoSettings(object): |
| 41 |
|
| 42 |
# Constrain dependency resolution to the master(s) |
| 43 |
# that are specified in layout.conf. |
| 44 |
- self.repo_config = repoman_repos.get_repo_for_location(self.repodir) |
| 45 |
+ self.repo_config = self.repositories.get_repo_for_location(self.repodir) |
| 46 |
self.portdb.porttrees = list(self.repo_config.eclass_db.porttrees) |
| 47 |
self.portdir = self.portdb.porttrees[0] |
| 48 |
self.commit_env = os.environ.copy() |
| 49 |
# list() is for iteration on a copy. |
| 50 |
- for repo in list(repoman_repos): |
| 51 |
+ for repo in list(self.repositories): |
| 52 |
# all paths are canonical |
| 53 |
if repo.location not in self.repo_config.eclass_db.porttrees: |
| 54 |
- del repoman_repos[repo.name] |
| 55 |
+ del self.repositories[repo.name] |
| 56 |
|
| 57 |
if self.repo_config.allow_provide_virtual: |
| 58 |
qawarnings.add("virtual.oldstyle") |
Archives