Gentoo Archives: gentoo-commits

From: Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/repository/
Date: Sun, 25 Dec 2011 19:43:26
Message-Id: 4cfa78b9406d9a8f94b3eae23631b2bb430bc533.arfrever@gentoo
1 commit: 4cfa78b9406d9a8f94b3eae23631b2bb430bc533
2 Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Gentoo <DOT> Org>
3 AuthorDate: Sun Dec 25 19:40:40 2011 +0000
4 Commit: Arfrever Frehtes Taifersar Arahesis <arfrever <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 25 19:40:40 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=4cfa78b9
7
8 portage.repository.config.RepoConfigLoader: Rename _add_overlays() to
9 _add_repositories().
10
11 ---
12 pym/portage/repository/config.py | 4 ++--
13 1 files changed, 2 insertions(+), 2 deletions(-)
14
15 diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py
16 index 0b99e1b..f98b9b7 100644
17 --- a/pym/portage/repository/config.py
18 +++ b/pym/portage/repository/config.py
19 @@ -290,7 +290,7 @@ class RepoConfigLoader(object):
20 """Loads and store config of several repositories, loaded from PORTDIR_OVERLAY or repos.conf"""
21
22 @staticmethod
23 - def _add_overlays(portdir, portdir_overlay, prepos, ignored_map, ignored_location_map):
24 + def _add_repositories(portdir, portdir_overlay, prepos, ignored_map, ignored_location_map):
25 """Add overlays in PORTDIR_OVERLAY as repositories"""
26 overlays = []
27 if portdir:
28 @@ -427,7 +427,7 @@ class RepoConfigLoader(object):
29
30 # If PORTDIR_OVERLAY contains a repo with the same repo_name as
31 # PORTDIR, then PORTDIR is overridden.
32 - portdir = self._add_overlays(portdir, portdir_overlay, prepos,
33 + portdir = self._add_repositories(portdir, portdir_overlay, prepos,
34 ignored_map, ignored_location_map)
35 if portdir and portdir.strip():
36 portdir = os.path.realpath(portdir)