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 5242C1384B4 for ; Mon, 23 Nov 2015 20:49:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DEC6221C018; Mon, 23 Nov 2015 20:49:41 +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 8A0B421C018 for ; Mon, 23 Nov 2015 20:49:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5B8BD340634 for ; Mon, 23 Nov 2015 20:49:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9286BA95 for ; Mon, 23 Nov 2015 20:49:32 +0000 (UTC) From: "Arfrever Frehtes Taifersar Arahesis" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arfrever Frehtes Taifersar Arahesis" Message-ID: <1448311626.041fc702c296a80a1eb60b4ae34e18030feafe8e.arfrever@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/repository/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/repository/config.py X-VCS-Directories: pym/portage/repository/ X-VCS-Committer: arfrever X-VCS-Committer-Name: Arfrever Frehtes Taifersar Arahesis X-VCS-Revision: 041fc702c296a80a1eb60b4ae34e18030feafe8e X-VCS-Branch: master Date: Mon, 23 Nov 2015 20:49:32 +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: bd6da015-fe81-4103-9485-0e9d0f4dfa3b X-Archives-Hash: 205519f3e8758cbd5a9ec0c0a571a31a commit: 041fc702c296a80a1eb60b4ae34e18030feafe8e Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Mon Nov 23 20:47:06 2015 +0000 Commit: Arfrever Frehtes Taifersar Arahesis apache org> CommitDate: Mon Nov 23 20:47:06 2015 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=041fc702 portage.repository.config.RepoConfigLoader._add_repositories(): Delete unused ignored_location_map parametre. pym/portage/repository/config.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py index 2ba03f0..977bb43 100644 --- a/pym/portage/repository/config.py +++ b/pym/portage/repository/config.py @@ -454,7 +454,7 @@ class RepoConfigLoader(object): @staticmethod def _add_repositories(portdir, portdir_overlay, prepos, - ignored_map, ignored_location_map, local_config, default_portdir): + ignored_map, local_config, default_portdir): """Add overlays in PORTDIR_OVERLAY as repositories""" overlays = [] portdir_orig = None @@ -524,7 +524,6 @@ class RepoConfigLoader(object): not (base_priority == 0 and old_location == default_portdir): ignored_map.setdefault(repo.name, []).append(old_location) - ignored_location_map[old_location] = repo.name if old_location == portdir: portdir = repo.user_location @@ -621,7 +620,6 @@ class RepoConfigLoader(object): location_map = {} treemap = {} ignored_map = {} - ignored_location_map = {} default_opts = { "EPREFIX" : settings["EPREFIX"], "EROOT" : settings["EROOT"], @@ -664,7 +662,7 @@ class RepoConfigLoader(object): # If PORTDIR_OVERLAY contains a repo with the same repo_name as # PORTDIR, then PORTDIR is overridden. portdir = self._add_repositories(portdir, portdir_overlay, prepos, - ignored_map, ignored_location_map, settings.local_config, + ignored_map, settings.local_config, default_portdir) if portdir and portdir.strip(): portdir = os.path.realpath(portdir)