| 1 |
commit: 041fc702c296a80a1eb60b4ae34e18030feafe8e |
| 2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
| 3 |
AuthorDate: Mon Nov 23 20:47:06 2015 +0000 |
| 4 |
Commit: Arfrever Frehtes Taifersar Arahesis <arfrever <AT> apache <DOT> org> |
| 5 |
CommitDate: Mon Nov 23 20:47:06 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=041fc702 |
| 7 |
|
| 8 |
portage.repository.config.RepoConfigLoader._add_repositories(): Delete unused ignored_location_map parametre. |
| 9 |
|
| 10 |
pym/portage/repository/config.py | 6 ++---- |
| 11 |
1 file changed, 2 insertions(+), 4 deletions(-) |
| 12 |
|
| 13 |
diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py |
| 14 |
index 2ba03f0..977bb43 100644 |
| 15 |
--- a/pym/portage/repository/config.py |
| 16 |
+++ b/pym/portage/repository/config.py |
| 17 |
@@ -454,7 +454,7 @@ class RepoConfigLoader(object): |
| 18 |
|
| 19 |
@staticmethod |
| 20 |
def _add_repositories(portdir, portdir_overlay, prepos, |
| 21 |
- ignored_map, ignored_location_map, local_config, default_portdir): |
| 22 |
+ ignored_map, local_config, default_portdir): |
| 23 |
"""Add overlays in PORTDIR_OVERLAY as repositories""" |
| 24 |
overlays = [] |
| 25 |
portdir_orig = None |
| 26 |
@@ -524,7 +524,6 @@ class RepoConfigLoader(object): |
| 27 |
not (base_priority == 0 and |
| 28 |
old_location == default_portdir): |
| 29 |
ignored_map.setdefault(repo.name, []).append(old_location) |
| 30 |
- ignored_location_map[old_location] = repo.name |
| 31 |
if old_location == portdir: |
| 32 |
portdir = repo.user_location |
| 33 |
|
| 34 |
@@ -621,7 +620,6 @@ class RepoConfigLoader(object): |
| 35 |
location_map = {} |
| 36 |
treemap = {} |
| 37 |
ignored_map = {} |
| 38 |
- ignored_location_map = {} |
| 39 |
default_opts = { |
| 40 |
"EPREFIX" : settings["EPREFIX"], |
| 41 |
"EROOT" : settings["EROOT"], |
| 42 |
@@ -664,7 +662,7 @@ class RepoConfigLoader(object): |
| 43 |
# If PORTDIR_OVERLAY contains a repo with the same repo_name as |
| 44 |
# PORTDIR, then PORTDIR is overridden. |
| 45 |
portdir = self._add_repositories(portdir, portdir_overlay, prepos, |
| 46 |
- ignored_map, ignored_location_map, settings.local_config, |
| 47 |
+ ignored_map, settings.local_config, |
| 48 |
default_portdir) |
| 49 |
if portdir and portdir.strip(): |
| 50 |
portdir = os.path.realpath(portdir) |
Archives