From: Zac Medico <zmedico@gentoo.org>
To: gentoo-portage-dev@lists.gentoo.org
Cc: Zac Medico <zmedico@gentoo.org>
Subject: [gentoo-portage-dev] [PATCH] sync: include metadata/layout.conf with profile submodule (bug 559122)
Date: Sat, 29 Aug 2015 12:57:27 -0700 [thread overview]
Message-ID: <1440878247-6241-1-git-send-email-zmedico@gentoo.org> (raw)
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
next reply other threads:[~2015-08-29 19:58 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-29 19:57 Zac Medico [this message]
2015-08-30 20:08 ` [gentoo-portage-dev] [PATCH] sync: include metadata/layout.conf with profile submodule (bug 559122) Brian Dolbec
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1440878247-6241-1-git-send-email-zmedico@gentoo.org \
--to=zmedico@gentoo.org \
--cc=gentoo-portage-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox