From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3B3B31384C0 for ; Sun, 30 Aug 2015 20:08:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E264B142AB; Sun, 30 Aug 2015 20:08:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 62F23142AA for ; Sun, 30 Aug 2015 20:08:40 +0000 (UTC) Received: from localhost (S010634bdfa9ecf80.vc.shawcable.net [96.49.31.57]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: dolsen) by smtp.gentoo.org (Postfix) with ESMTPSA id 3D4A9340831 for ; Sun, 30 Aug 2015 20:08:39 +0000 (UTC) Date: Sun, 30 Aug 2015 13:08:37 -0700 From: Brian Dolbec To: gentoo-portage-dev@lists.gentoo.org Subject: Re: [gentoo-portage-dev] [PATCH] sync: include metadata/layout.conf with profile submodule (bug 559122) Message-ID: <20150830130837.70ddb5fc.dolsen@gentoo.org> In-Reply-To: <1440878247-6241-1-git-send-email-zmedico@gentoo.org> References: <1440878247-6241-1-git-send-email-zmedico@gentoo.org> Organization: Gentoo Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-portage-dev@lists.gentoo.org Reply-to: gentoo-portage-dev@lists.gentoo.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Archives-Salt: 44d30090-1da2-49f0-8f4a-86592d370e98 X-Archives-Hash: 885a4cf8c157bd15b6a327efe0167ec9 On Sat, 29 Aug 2015 12:57:27 -0700 Zac Medico 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