[gentoo-commits] proj/portage:repoman commit in: pym/repoman/

[Brian Dolbec]

commit:     486b12e11a09953b9dda0e98643f6d6ebd6409f8
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 17 02:39:34 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Sep 17 04:41:28 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=486b12e1

repoman/repos.py: Fix a regression where the repo is not in repos.conf

The regression was introduced when a variable was used to reduce the size of
some long lines.  The variable was not being reset after the repo was added, so
the remaining code was looking at a stale config.
It turned out the variable was a dupe of an already properly updated class wide
one.

Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org>

 pym/repoman/repos.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pym/repoman/repos.py b/pym/repoman/repos.py
index 5044411..ec12aaa 100644
--- a/pym/repoman/repos.py
+++ b/pym/repoman/repos.py
@@ -30,12 +30,12 @@ class RepoSettings(object):
                self.repoman_settings = repoman_settings
                self.vcs_settings = vcs_settings
 
-               repoman_repos = self.repoman_settings.repositories
+               self.repositories = self.repoman_settings.repositories
 
                # Ensure that current repository is in the list of enabled 
repositories.
                self.repodir = os.path.realpath(portdir_overlay)
                try:
-                       repoman_repos.get_repo_for_location(self.repodir)
+                       self.repositories.get_repo_for_location(self.repodir)
                except KeyError:
                        self._add_repo(config_root, portdir_overlay)
 
@@ -47,15 +47,15 @@ class RepoSettings(object):
 
                # Constrain dependency resolution to the master(s)
                # that are specified in layout.conf.
-               self.repo_config = 
repoman_repos.get_repo_for_location(self.repodir)
+               self.repo_config = 
self.repositories.get_repo_for_location(self.repodir)
                self.portdb.porttrees = 
list(self.repo_config.eclass_db.porttrees)
                self.portdir = self.portdb.porttrees[0]
                self.commit_env = os.environ.copy()
                # list() is for iteration on a copy.
-               for repo in list(repoman_repos):
+               for repo in list(self.repositories):
                        # all paths are canonical
                        if repo.location not in 
self.repo_config.eclass_db.porttrees:
-                               del repoman_repos[repo.name]
+                               del self.repositories[repo.name]
 
                if self.repo_config.allow_provide_virtual:
                        qawarnings.add("virtual.oldstyle")