From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 185271387B1 for ; Mon, 21 Sep 2015 23:48:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9325F21C026; Mon, 21 Sep 2015 23:48:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7D43D21C012 for ; Mon, 21 Sep 2015 23:48:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BCC8F340983 for ; Mon, 21 Sep 2015 23:47:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EAEED23D for ; Mon, 21 Sep 2015 23:47:55 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1442878965.1ab7562ec6027e5edd118e66a9e39d2353d8bc87.dolsen@gentoo> Subject: [gentoo-commits] proj/portage:repoman commit in: pym/repoman/ X-VCS-Repository: proj/portage X-VCS-Files: pym/repoman/repos.py X-VCS-Directories: pym/repoman/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 1ab7562ec6027e5edd118e66a9e39d2353d8bc87 X-VCS-Branch: repoman Date: Mon, 21 Sep 2015 23:47:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b7367146-143a-4316-bf28-222872070734 X-Archives-Hash: 06efe4eea4c60b4967053d53857cef65 commit: 1ab7562ec6027e5edd118e66a9e39d2353d8bc87 Author: Brian Dolbec gentoo org> AuthorDate: Thu Sep 17 02:39:34 2015 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Mon Sep 21 23:42:45 2015 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=1ab7562e 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 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 700c064..de99fdf 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") From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3653D1387B1 for ; Mon, 21 Sep 2015 23:51:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1F04B21C035; Mon, 21 Sep 2015 23:51:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 61D1B21C01C for ; Mon, 21 Sep 2015 23:51:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B08CE34099A for ; Mon, 21 Sep 2015 23:51:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DBA9E23D for ; Mon, 21 Sep 2015 23:51:18 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1442878965.1ab7562ec6027e5edd118e66a9e39d2353d8bc87.dolsen@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/repoman/ X-VCS-Repository: proj/portage X-VCS-Files: pym/repoman/repos.py X-VCS-Directories: pym/repoman/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 1ab7562ec6027e5edd118e66a9e39d2353d8bc87 X-VCS-Branch: master Date: Mon, 21 Sep 2015 23:51:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c8334869-d67e-4ae5-b369-5d13192664a4 X-Archives-Hash: d5974743f95afe136637cb99db315b07 Message-ID: <20150921235118.3SioRY2PseETFFpLJBqoHEhaNRNkV6f7jwD-_-UY8f8@z> commit: 1ab7562ec6027e5edd118e66a9e39d2353d8bc87 Author: Brian Dolbec gentoo org> AuthorDate: Thu Sep 17 02:39:34 2015 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Mon Sep 21 23:42:45 2015 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=1ab7562e 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 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 700c064..de99fdf 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")