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