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