1 |
commit: 4a3f6ce8e5c64b7447bb32851ee91e19faf18be3 |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Aug 29 19:56:50 2015 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Aug 30 23:50:58 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=4a3f6ce8 |
7 |
|
8 |
sync: include metadata/layout.conf with profile submodule (bug 559122) |
9 |
|
10 |
Since metadata/layout.conf settings such as profile-formats affect the |
11 |
interpretation of profiles, make the profiles submodule include this |
12 |
file (which is all that's needed for a minimal binhost client). |
13 |
|
14 |
X-Gentoo-Bug: 559122 |
15 |
X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=559122 |
16 |
Acked-by: Brian Dolbec <dolsen <AT> gentoo.org> |
17 |
|
18 |
pym/portage/sync/__init__.py | 6 +++--- |
19 |
pym/portage/sync/syncbase.py | 2 +- |
20 |
2 files changed, 4 insertions(+), 4 deletions(-) |
21 |
|
22 |
diff --git a/pym/portage/sync/__init__.py b/pym/portage/sync/__init__.py |
23 |
index 32b2c45..805b1f2 100644 |
24 |
--- a/pym/portage/sync/__init__.py |
25 |
+++ b/pym/portage/sync/__init__.py |
26 |
@@ -9,9 +9,9 @@ from portage.sync.controller import SyncManager |
27 |
from portage.sync.config_checks import check_type |
28 |
|
29 |
_SUBMODULE_PATH_MAP = OrderedDict([ |
30 |
- ('glsa', 'metadata/glsa'), |
31 |
- ('news', 'metadata/news'), |
32 |
- ('profiles', 'profiles'), |
33 |
+ ('glsa', ('metadata/glsa',)), |
34 |
+ ('news', ('metadata/news',)), |
35 |
+ ('profiles', ('metadata/layout.conf', 'profiles')), |
36 |
]) |
37 |
|
38 |
path = os.path.join(os.path.dirname(__file__), "modules") |
39 |
|
40 |
diff --git a/pym/portage/sync/syncbase.py b/pym/portage/sync/syncbase.py |
41 |
index d30d69d..6aaa9c4 100644 |
42 |
--- a/pym/portage/sync/syncbase.py |
43 |
+++ b/pym/portage/sync/syncbase.py |
44 |
@@ -99,7 +99,7 @@ class SyncBase(object): |
45 |
emerge_config = self.options.get('emerge_config') |
46 |
if emerge_config is not None: |
47 |
for name in emerge_config.opts.get('--sync-submodule', []): |
48 |
- paths.append(_SUBMODULE_PATH_MAP[name]) |
49 |
+ paths.extend(_SUBMODULE_PATH_MAP[name]) |
50 |
return tuple(paths) |