[gentoo-commits] proj/ufed:master commit in: /

[Sven Eden]

commit:     1918d93f84127f9ba2142e7d03ec0d38b2705d10
Author:     Sven Eden <sven.eden <AT> gmx <DOT> de>
AuthorDate: Fri Feb  1 15:55:58 2013 +0000
Commit:     Sven Eden <sven.eden <AT> gmx <DOT> de>
CommitDate: Fri Feb  1 15:55:58 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/ufed.git;a=commit;h=1918d93f

Fixed a bug that caused ufed to "forget" all enabled flags from make.conf if the flag had only local descriptions.

---
 Portage.pm |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Portage.pm b/Portage.pm
index 933d4d1..1d7a800 100644
--- a/Portage.pm
+++ b/Portage.pm
@@ -172,7 +172,7 @@ sub _add_flag
 		} else {
 			%{$use_flags->{$flag}{"local"}{$pkg}} = %data;
 		}
-		++$use_flags->{$flag}{count};
+		++$use_flags->{$flag}{count} if (length($descr));
 
 
 	} else {
@@ -198,6 +198,7 @@ sub _add_temp
 		defined ($_use_temp->{$flag}{global})
 			or %{$_use_temp->{$flag}{global}} = %$_use_template;
 	} else {
+		_add_temp($flag, "global"); ## This must exist!
 		defined ($_use_temp->{$flag}{"local"}{$pkg})
 			or %{$_use_temp->{$flag}{"local"}{$pkg}} = %$_use_template;
 	}
@@ -304,8 +305,8 @@ sub _gen_use_flags
 	for my $flag (keys %$_use_temp) {
 		my %descCons = ();
 		my $flagRef  = $_use_temp->{$flag}; ## Shortcut
-		my $hasGlobal= (defined($flagRef->{global}) && length($flagRef->{global}{descr})) ? 1 : 0;
-		my $lCount   = $hasGlobal;
+		my $hasGlobal= defined($flagRef->{global}) ? 1 : 0;
+		my $lCount   = ($hasGlobal && length($flagRef->{global}{desc})) ? 1 : 0;
 		my $gDesc    = "";
 		my $gKey     = "";
 		my $gRef     = $flagRef->{global};
@@ -523,7 +524,6 @@ sub _read_make_conf {
 
 	# Note the conf state of the read flags:
 	for my $flag ( keys %{$oldEnv{USE}}) {
-
 		_add_temp($flag, "global");
 
 		$oldEnv{USE}{$flag}