From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-560807-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 0B2AE138B0F
for <garchives@archives.gentoo.org>; Tue, 19 Feb 2013 13:35:04 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id CEEF4E0329;
Tue, 19 Feb 2013 13:35:02 +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 5E36FE0329
for <gentoo-commits@lists.gentoo.org>; Tue, 19 Feb 2013 13:35:02 +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 51A0E33DC98
for <gentoo-commits@lists.gentoo.org>; Tue, 19 Feb 2013 13:35:01 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by hornbill.gentoo.org (Postfix) with ESMTP id CF79CE4073
for <gentoo-commits@lists.gentoo.org>; Tue, 19 Feb 2013 13:34:59 +0000 (UTC)
From: "Sven Eden" <sven.eden@gmx.de>
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" <sven.eden@gmx.de>
Message-ID: <1361280953.33859fe88664439f2bf272d08b1d9586aaae81dd.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: 33859fe88664439f2bf272d08b1d9586aaae81dd
X-VCS-Branch: master
Date: Tue, 19 Feb 2013 13:34:59 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 1f284e1f-9f2d-451c-ade4-331043fa4072
X-Archives-Hash: 996ed43febdadcb4a486b9c70b228f05
commit: 33859fe88664439f2bf272d08b1d9586aaae81dd
Author: Sven Eden <sven.eden <AT> gmx <DOT> de>
AuthorDate: Tue Feb 19 13:35:53 2013 +0000
Commit: Sven Eden <sven.eden <AT> gmx <DOT> de>
CommitDate: Tue Feb 19 13:35:53 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/ufed.git;a=commit;h=33859fe8
Fixed an issue with auto-hash not working on perl < 5.16
---
Portage.pm | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/Portage.pm b/Portage.pm
index 9130a37..97ba400 100644
--- a/Portage.pm
+++ b/Portage.pm
@@ -946,23 +946,22 @@ sub _read_use_mask {
# USE_EXPAND_HIDDEN flags, as they must not be seen anyway.
sub _remove_expands {
- if (defined($_environment{USE_EXPAND})) {
- for my $key (map {my $x=lc($_)."_"; $x } keys $_environment{USE_EXPAND}) {
- for my $flag (keys %$_use_temp) {
- if ($flag =~ /^$key/ ) {
- delete($_use_temp->{$flag});
- }
- }
+ my $expands = $_environment{USE_EXPAND} || {};
+ my $hidden = $_environment{USE_EXPAND_HIDDEN} || {};
+
+ for my $key (map {my $x=lc($_)."_"; $x } keys %$expands) {
+ for my $flag (keys %$_use_temp) {
+ if ($flag =~ /^$key/ ) {
+ delete($_use_temp->{$flag});
+ }
}
} ## Done looping USE_EXPAND
- if (defined($_environment{USE_EXPAND_HIDDEN})) {
- for my $key (map {my $x=lc($_)."_"; $x } keys $_environment{USE_EXPAND_HIDDEN}) {
- for my $flag (keys %$_use_temp) {
- if ($flag =~ /^$key/ ) {
- delete($_use_temp->{$flag});
- }
- }
+ for my $key (map {my $x=lc($_)."_"; $x } keys %$hidden) {
+ for my $flag (keys %$_use_temp) {
+ if ($flag =~ /^$key/ ) {
+ delete($_use_temp->{$flag});
+ }
}
} ## Done looping USE_EXPAND_HIDDEN