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 9669313887B for ; Tue, 5 Feb 2013 11:24:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 27B64E0025; Tue, 5 Feb 2013 11:24:20 +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 B6200E0025 for ; Tue, 5 Feb 2013 11:24:19 +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 B5F1E33DC25 for ; Tue, 5 Feb 2013 11:24:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 5234EE4073 for ; Tue, 5 Feb 2013 11:24:17 +0000 (UTC) From: "Sven Eden" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sven Eden" Message-ID: <1360063514.5452656baf62f9bb53635ea1d10780136be4a93a.yamakuzure@gentoo> Subject: [gentoo-commits] proj/ufed:master commit in: / X-VCS-Repository: proj/ufed X-VCS-Files: Portage.pm X-VCS-Directories: / X-VCS-Committer: yamakuzure X-VCS-Committer-Name: Sven Eden X-VCS-Revision: 5452656baf62f9bb53635ea1d10780136be4a93a X-VCS-Branch: master Date: Tue, 5 Feb 2013 11:24:17 +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: e0f108d3-13e6-4432-ac6a-c289ba19b98d X-Archives-Hash: 0d62bbf26ac4a9be15d2d7317901876f commit: 5452656baf62f9bb53635ea1d10780136be4a93a Author: Sven Eden gmx de> AuthorDate: Tue Feb 5 11:25:14 2013 +0000 Commit: Sven Eden gmx de> CommitDate: Tue Feb 5 11:25:14 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/ufed.git;a=commit;h=5452656b Fixed a bug that made ufed forget about /etc/portage/package.use if a package was installed that has a different setting in IUSE. --- Portage.pm | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Portage.pm b/Portage.pm index 7ca9fc1..b647e7a 100644 --- a/Portage.pm +++ b/Portage.pm @@ -107,7 +107,8 @@ INIT { _determine_eprefix; _determine_make_conf; _determine_profiles; - _read_make_globals; + _read_make_globals; + _read_make_conf; ## Needed first to know about overlays # Now with the defaults loaded, a check is in order # whether the set USE_ORDER is supported: @@ -116,20 +117,15 @@ INIT { my $lastorder = ""; my @use_order = reverse split /:/, $_environment{USE_ORDER}; for my $order(@use_order) { - if($order eq 'defaults') { - _read_make_defaults - } elsif($order eq 'conf') { - _read_make_conf - } else { - next; - } - $lastorder = $order; + $lastorder = $order + if( ($order eq 'defaults') || ($order eq 'conf') ); } $lastorder eq 'conf' or die("Sorry, USE_ORDER without make.conf overriding global" . " USE flags are not currently supported by ufed.\n"); _read_packages; + _read_make_defaults; _read_use_force; ## Must be before _read_use_mask to not _read_use_mask; ## unintentionally unmask explicitly masked flags. _read_archs; @@ -330,6 +326,7 @@ sub _gen_use_flags $descCons{$pKey}{$pkg} = 1; ++$lCount; } + ## TODO : Add affected packages that have no own description # once the interface can handle them. These can be used for # the package filtering per command line arguments later.