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 76745138A90 for ; Sat, 16 Feb 2013 19:06:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 09903E04AB; Sat, 16 Feb 2013 19:06:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8F669E04AB for ; Sat, 16 Feb 2013 19:06:29 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 92A7533D8D6 for ; Sat, 16 Feb 2013 19:06:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 2888FE4073 for ; Sat, 16 Feb 2013 19:06:27 +0000 (UTC) From: "Thomas Sachau" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Sachau" Message-ID: <1361041578.bc8191896c294d8eb8758649ed87c24be2b2dca4.tommy@gentoo> Subject: [gentoo-commits] proj/portage:multilib commit in: pym/portage/package/ebuild/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/package/ebuild/config.py X-VCS-Directories: pym/portage/package/ebuild/ X-VCS-Committer: tommy X-VCS-Committer-Name: Thomas Sachau X-VCS-Revision: bc8191896c294d8eb8758649ed87c24be2b2dca4 X-VCS-Branch: multilib Date: Sat, 16 Feb 2013 19:06:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b6f54064-37cc-4f48-8643-ed848680d903 X-Archives-Hash: 0de02726c96c6438b7dbcf475f10635a commit: bc8191896c294d8eb8758649ed87c24be2b2dca4 Author: Thomas Sachau gentoo org> AuthorDate: Sat Feb 16 19:06:18 2013 +0000 Commit: Thomas Sachau gentoo org> CommitDate: Sat Feb 16 19:06:18 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=bc819189 Use self.features, since features is not any more defined --- pym/portage/package/ebuild/config.py | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index c5ff688..265b924 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -847,7 +847,11 @@ class config(object): if portage._internal_caller: self["PORTAGE_INTERNAL_CALLER"] = "1" self.backup_changes("PORTAGE_INTERNAL_CALLER") - if 'force-multilib' in features: + + # initialize self.features + self.regenerate() + + if 'force-multilib' in self.features: #add multilib_abi internally to list of USE_EXPANDed vars self["USE_EXPAND"] = "MULTILIB_ABI" + " " + self.get("USE_EXPAND", "") self.backup_changes("USE_EXPAND") @@ -855,9 +859,6 @@ class config(object): if default_abi: self.configdict["defaults"]["USE"] = self.configdict["defaults"].get("USE", "") + " multilib_abi_" + default_abi - # initialize self.features - self.regenerate() - if bsd_chflags: self.features.add('chflags')