diff options
| author |   Sven Eden <seden@havi.de> | 2015-02-12 16:47:01 +0100 |
|---|---|---|
| committer | Sven Eden <seden@havi.de> | 2015-02-12 16:47:01 +0100 |
| commit | 61532b5a6b52ba7371f45109769718164ce4a4fc (patch) | |
| tree | 9e639873a7b2a1b237e2425dff77b8f3ae714328 | |
| parent | Portage.pm: Fixed a possible "Use of uninitialized value" if a read file is e... (diff) | |
| download | ufed-61532b5a6b52ba7371f45109769718164ce4a4fc.tar.gz ufed-61532b5a6b52ba7371f45109769718164ce4a4fc.tar.bz2 ufed-61532b5a6b52ba7371f45109769718164ce4a4fc.zip | |
Fix truncation of -* if set in make.conf.ufed-0.92
| -rw-r--r-- | Portage.pm | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -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 |