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 1635413838B for ; Tue, 30 Sep 2014 21:59:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2E9E6E08D4; Tue, 30 Sep 2014 21:59:32 +0000 (UTC) Received: from mail-oi0-f74.google.com (mail-oi0-f74.google.com [209.85.218.74]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3B8D7E08C7 for ; Tue, 30 Sep 2014 21:59:30 +0000 (UTC) Received: by mail-oi0-f74.google.com with SMTP id a141so382012oig.3 for ; Tue, 30 Sep 2014 14:59:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=k7paSeZJoYCAKtenW1IXsDXdGwWZZnF5E9x0q8ZFb7k=; b=bzGb59rAtZRDv8q3Za6C0+UzPpLxOybACaujYg/PRazWZ8pKDYgv9bITBPNtiSG4VC LGVFsg6nIFuD8wWDDAzBv3CHu1h8Ptke0NAnU2kENadbvNx1QmD28ZEyKSjrW9MBl8oD LVFkCrbojkPf8JzyOXlWfJI8p1UMlhXnww9RE25uJq/wApLIhOCtjAtbFIqHNr4xgPDo KMU3P7F454TerVs5vWCwNe9eeDOrXyD1qOkomQyyuu0Uw0fcTLkDCUIWAGvKIhQKv2n0 5ImVYyOIPMoXcMYA9HsLgKJWzX0Cg+lO1MyKnIb5HCz0CGJ507nEIUAfwNqNC5gIrOgc 1/sw== X-Gm-Message-State: ALoCoQmw6//kdTErN05oZkVV5DjkXwgCBTcnMIdTvx9CmDUvOWmX0BtuzQqdua+s/ii+7ry6Ghn2 X-Received: by 10.182.131.226 with SMTP id op2mr40651387obb.17.1412114369933; Tue, 30 Sep 2014 14:59:29 -0700 (PDT) Received: from corpmail-nozzle1-1.hot.corp.google.com ([100.108.1.104]) by gmr-mx.google.com with ESMTPS id l45si951336yha.2.2014.09.30.14.59.29 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 Sep 2014 14:59:29 -0700 (PDT) Received: from bsimonnet-linux.mtv.corp.google.com ([172.22.64.31]) by corpmail-nozzle1-1.hot.corp.google.com with ESMTP id k8eZ3tk6.1; Tue, 30 Sep 2014 14:59:29 -0700 Received: by bsimonnet-linux.mtv.corp.google.com (Postfix, from userid 235571) id 30A17202F23; Mon, 29 Sep 2014 15:32:11 -0700 (PDT) From: Bertrand SIMONNET To: gentoo-portage-dev@lists.gentoo.org Cc: Bertrand SIMONNET Subject: [gentoo-portage-dev] [PATCH 2/3] Add profile-formats to profile_complex Date: Mon, 29 Sep 2014 15:31:52 -0700 Message-Id: <1412029913-13421-3-git-send-email-bsimonnet@chromium.org> X-Mailer: git-send-email 2.1.0.rc2.206.gedb03e5 In-Reply-To: <1412029913-13421-2-git-send-email-bsimonnet@chromium.org> References: <5425944A.2090404@gentoo.org> <1412029913-13421-1-git-send-email-bsimonnet@chromium.org> <1412029913-13421-2-git-send-email-bsimonnet@chromium.org> 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: 5a249ed4-aece-41ed-b991-87f5edbe30a1 X-Archives-Hash: eaa4ed1d8a38086e4831c1ba6ee494dd --- pym/portage/package/ebuild/_config/LocationsManager.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pym/portage/package/ebuild/_config/LocationsManager.py b/pym/portage/package/ebuild/_config/LocationsManager.py index 4427f1d..8bf321c 100644 --- a/pym/portage/package/ebuild/_config/LocationsManager.py +++ b/pym/portage/package/ebuild/_config/LocationsManager.py @@ -31,7 +31,7 @@ _PORTAGE1_DIRECTORIES = frozenset([ 'use.mask', 'use.force']) _profile_node = collections.namedtuple('_profile_node', - 'location portage1_directories user_config') + 'location portage1_directories user_config profile_formats') _allow_parent_colon = frozenset( ["portage-2"]) @@ -132,7 +132,7 @@ class LocationsManager(object): self.user_profile_dir = custom_prof self.profiles.append(custom_prof) self.profiles_complex.append( - _profile_node(custom_prof, True, True)) + _profile_node(custom_prof, True, True, ())) del custom_prof self.profiles = tuple(self.profiles) @@ -151,6 +151,7 @@ class LocationsManager(object): allow_parent_colon = True repo_loc = None compat_mode = False + current_formats = () eapi_file = os.path.join(currentPath, "eapi") eapi = "0" @@ -183,6 +184,8 @@ class LocationsManager(object): layout_data['profile-formats'] == ('portage-1-compat',) allow_parent_colon = any(x in _allow_parent_colon for x in layout_data['profile-formats']) + current_formats = tuple(layout_data['profile-formats']) + if compat_mode: offenders = _PORTAGE1_DIRECTORIES.intersection(os.listdir(currentPath)) @@ -233,7 +236,8 @@ class LocationsManager(object): self.profiles.append(currentPath) self.profiles_complex.append( - _profile_node(currentPath, allow_directories, False)) + _profile_node(currentPath, allow_directories, False, + current_formats)) def _expand_parent_colon(self, parentsFile, parentPath, repo_loc, repositories): -- 2.1.0.rc2.206.gedb03e5