[gentoo-portage-dev] [PATCH] sync: include metadata/layout.conf with profile submodule (bug 559122)

[gentoo-portage-dev] [PATCH] sync: include metadata/layout.conf with profile submodule (bug 559122)

[Zac Medico]

Since metadata/layout.conf settings such as profile-formats affect the
interpretation of profiles, make the profiles submodule include this
file (which is all that's needed for a minimal binhost client).

X-Gentoo-Bug: 559122
X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=559122
---
 pym/portage/sync/__init__.py | 6 +++---
 pym/portage/sync/syncbase.py | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pym/portage/sync/__init__.py b/pym/portage/sync/__init__.py
index 32b2c45..805b1f2 100644
--- a/pym/portage/sync/__init__.py
+++ b/pym/portage/sync/__init__.py
@@ -9,9 +9,9 @@ from portage.sync.controller import SyncManager
 from portage.sync.config_checks import check_type
 
 _SUBMODULE_PATH_MAP = OrderedDict([
-	('glsa', 'metadata/glsa'),
-	('news', 'metadata/news'),
-	('profiles', 'profiles'),
+	('glsa', ('metadata/glsa',)),
+	('news', ('metadata/news',)),
+	('profiles', ('metadata/layout.conf', 'profiles')),
 ])
 
 path = os.path.join(os.path.dirname(__file__), "modules")
diff --git a/pym/portage/sync/syncbase.py b/pym/portage/sync/syncbase.py
index d30d69d..6aaa9c4 100644
--- a/pym/portage/sync/syncbase.py
+++ b/pym/portage/sync/syncbase.py
@@ -99,7 +99,7 @@ class SyncBase(object):
 		emerge_config = self.options.get('emerge_config')
 		if emerge_config is not None:
 			for name in emerge_config.opts.get('--sync-submodule', []):
-				paths.append(_SUBMODULE_PATH_MAP[name])
+				paths.extend(_SUBMODULE_PATH_MAP[name])
 		return tuple(paths)
 
 
-- 
2.4.6

Re: [gentoo-portage-dev] [PATCH] sync: include metadata/layout.conf with profile submodule (bug 559122)

[Brian Dolbec]

On Sat, 29 Aug 2015 12:57:27 -0700
Zac Medico <zmedico@gentoo.org> wrote:

> Since metadata/layout.conf settings such as profile-formats affect the
> interpretation of profiles, make the profiles submodule include this
> file (which is all that's needed for a minimal binhost client).
> 
> X-Gentoo-Bug: 559122
> X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=559122
> ---
>  pym/portage/sync/__init__.py | 6 +++---
>  pym/portage/sync/syncbase.py | 2 +-
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/pym/portage/sync/__init__.py
> b/pym/portage/sync/__init__.py index 32b2c45..805b1f2 100644
> --- a/pym/portage/sync/__init__.py
> +++ b/pym/portage/sync/__init__.py
> @@ -9,9 +9,9 @@ from portage.sync.controller import SyncManager
>  from portage.sync.config_checks import check_type
>  
>  _SUBMODULE_PATH_MAP = OrderedDict([
> -	('glsa', 'metadata/glsa'),
> -	('news', 'metadata/news'),
> -	('profiles', 'profiles'),
> +	('glsa', ('metadata/glsa',)),
> +	('news', ('metadata/news',)),
> +	('profiles', ('metadata/layout.conf', 'profiles')),
>  ])
>  
>  path = os.path.join(os.path.dirname(__file__), "modules")
> diff --git a/pym/portage/sync/syncbase.py
> b/pym/portage/sync/syncbase.py index d30d69d..6aaa9c4 100644
> --- a/pym/portage/sync/syncbase.py
> +++ b/pym/portage/sync/syncbase.py
> @@ -99,7 +99,7 @@ class SyncBase(object):
>  		emerge_config = self.options.get('emerge_config')
>  		if emerge_config is not None:
>  			for name in
> emerge_config.opts.get('--sync-submodule', []):
> -
> paths.append(_SUBMODULE_PATH_MAP[name])
> +
> paths.extend(_SUBMODULE_PATH_MAP[name]) return tuple(paths)
>  
>  

also looks good :)

-- 
Brian Dolbec <dolsen>