Gentoo Archives: gentoo-commits

From: Arfrever Frehtes Taifersar Arahesis <arfrever@××××××.org>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/repository/
Date: Mon, 23 Nov 2015 20:41:45
Message-Id: 1448311075.c1a2714c5e5d6d3fdda5594c6e5997e769552185.arfrever@gentoo
1 commit: c1a2714c5e5d6d3fdda5594c6e5997e769552185
2 Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
3 AuthorDate: Mon Nov 23 20:37:55 2015 +0000
4 Commit: Arfrever Frehtes Taifersar Arahesis <arfrever <AT> apache <DOT> org>
5 CommitDate: Mon Nov 23 20:37:55 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=c1a2714c
7
8 portage.repository.config.RepoConfigLoader._parse(): Delete unused ignored_map and ignored_location_map parametres.
9
10 pym/portage/repository/config.py | 8 ++------
11 1 file changed, 2 insertions(+), 6 deletions(-)
12
13 diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py
14 index ffb4544..2ba03f0 100644
15 --- a/pym/portage/repository/config.py
16 +++ b/pym/portage/repository/config.py
17 @@ -547,7 +547,7 @@ class RepoConfigLoader(object):
18 return portdir
19
20 @staticmethod
21 - def _parse(paths, prepos, ignored_map, ignored_location_map, local_config, portdir, default_opts):
22 + def _parse(paths, prepos, local_config, portdir, default_opts):
23 """Parse files in paths to load config"""
24 parser = SafeConfigParser(defaults=default_opts)
25
26 @@ -644,9 +644,7 @@ class RepoConfigLoader(object):
27 settings.get("PORTAGE_RSYNC_EXTRA_OPTS", None)
28
29 try:
30 - self._parse(paths, prepos, ignored_map,
31 - ignored_location_map, settings.local_config,
32 - portdir, default_opts)
33 + self._parse(paths, prepos, settings.local_config, portdir, default_opts)
34 except ConfigParserError as e:
35 writemsg(
36 _("!!! Error while reading repo config file: %s\n") % e,
37 @@ -659,8 +657,6 @@ class RepoConfigLoader(object):
38 {}, local_config=settings.local_config)
39 location_map.clear()
40 treemap.clear()
41 - ignored_map.clear()
42 - ignored_location_map.clear()
43
44 default_portdir = os.path.join(os.sep,
45 settings['EPREFIX'].lstrip(os.sep), 'usr', 'portage')