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 B83061384C0 for ; Sat, 29 Aug 2015 19:58:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2243F142B6; Sat, 29 Aug 2015 19:57:57 +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 9E7B3142B3 for ; Sat, 29 Aug 2015 19:57:56 +0000 (UTC) Received: from x202e.gaikai.biz, (ip174-67-205-96.oc.oc.cox.net [174.67.205.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: zmedico) by smtp.gentoo.org (Postfix) with ESMTPSA id 637E134090B; Sat, 29 Aug 2015 19:57:55 +0000 (UTC) From: Zac Medico To: gentoo-portage-dev@lists.gentoo.org Cc: Zac Medico Subject: [gentoo-portage-dev] [PATCH] sync: include metadata/layout.conf with profile submodule (bug 559122) Date: Sat, 29 Aug 2015 12:57:27 -0700 Message-Id: <1440878247-6241-1-git-send-email-zmedico@gentoo.org> X-Mailer: git-send-email 2.4.6 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 X-Archives-Salt: 5a407c05-8e22-4865-9aad-008db3133873 X-Archives-Hash: 9766ac2181607740c9ef637bcc05f2af 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