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 DEDC4138A1A for ; Thu, 12 Feb 2015 15:47:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 71466E084E; Thu, 12 Feb 2015 15:47:09 +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 17793E084E for ; Thu, 12 Feb 2015 15:47:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 14CF03406FA for ; Thu, 12 Feb 2015 15:47:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5B367119A6 for ; Thu, 12 Feb 2015 15:47:05 +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: <1423756021.61532b5a6b52ba7371f45109769718164ce4a4fc.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: 61532b5a6b52ba7371f45109769718164ce4a4fc X-VCS-Branch: master Date: Thu, 12 Feb 2015 15:47:05 +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: bf1f7522-f2cf-4759-88f0-e19f7a48217e X-Archives-Hash: de894e81ff7773330d496d2e67efeabd commit: 61532b5a6b52ba7371f45109769718164ce4a4fc Author: Sven Eden havi de> AuthorDate: Thu Feb 12 15:47:01 2015 +0000 Commit: Sven Eden gmx de> CommitDate: Thu Feb 12 15:47:01 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/ufed.git;a=commit;h=61532b5a Fix truncation of -* if set in make.conf. --- Portage.pm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Portage.pm b/Portage.pm index d90be5e..a86e5bb 100644 --- a/Portage.pm +++ b/Portage.pm @@ -431,19 +431,19 @@ sub _determine_profiles # No parameters accepted sub _final_cleaning { - # The "disable all" flag is truncated to '*' by the parsing, but it - # has to read '-*'. + # The "disable all" flag is truncated to '*' by the parsing, but + # it has to read '-*'. _add_temp("-*", "global"); $_use_temp->{'-*'}{global}{descr} = "{Never enable any flags other than those specified in make.conf}"; $_use_temp->{'-*'}{global}{conf} = 0; ## Can never be -1 - + # Set it from the truncated config: if (defined($_use_temp->{'*'}{global})) { - $_use_temp->{'*'}{global}{conf} > 0 + $_use_temp->{'*'}{global}{conf} > -1 and $_use_temp->{'-*'}{global}{conf} = 1; } - + # The following use flags are dangerous or internal only # and must no be available using ufed: defined($_use_temp->{"*"}) and delete($_use_temp->{"*"}); @@ -863,7 +863,9 @@ sub _read_make_conf { $oldEnv{USE}{$flag} and $_use_temp->{$flag}{global}{conf} = 1 - or $_use_temp->{$flag}{global}{conf} = -1; + or $flag eq '*' + and $_use_temp->{$flag}{global}{conf} = 1 + or $_use_temp->{$flag}{global}{conf} = -1; } # Add PORTDIR and overlays to @_profiles