|
Lines 29-35
Link Here
|
| 29 |
@{$use_descriptions{$_}} = "(Unknown)" |
29 |
@{$use_descriptions{$_}} = "(Unknown)" |
| 30 |
if not exists $use_descriptions{$_}; |
30 |
if not exists $use_descriptions{$_}; |
| 31 |
} |
31 |
} |
| 32 |
@{$use_descriptions{'-*'}} = 'Never enable any flags other than those specified in /etc/make.conf'; |
32 |
@{$use_descriptions{'-*'}} = 'Never enable any flags other than those specified in /etc/[portage/]make.conf'; |
| 33 |
|
33 |
|
| 34 |
for(@Portage::archs) { |
34 |
for(@Portage::archs) { |
| 35 |
delete $Portage::default_flags{$_}; |
35 |
delete $Portage::default_flags{$_}; |
|
Lines 155-164
Link Here
|
| 155 |
|
155 |
|
| 156 |
my (@flags) = @_; |
156 |
my (@flags) = @_; |
| 157 |
my $contents; |
157 |
my $contents; |
|
|
158 |
my $makeconfname = ( -e '/etc/portage/make.conf' ) ? '/etc/portage/make.conf' : '/etc/make.conf'; |
| 158 |
|
159 |
|
| 159 |
{ |
160 |
{ |
| 160 |
open my $makeconf, '<', '/etc/make.conf' or die "Couldn't open /etc/make.conf\n"; |
161 |
open my $makeconf, '<', $makeconfname or die "Couldn't open $makeconfname\n"; |
| 161 |
open my $makeconfold, '>', '/etc/make.conf.old' or die "Couldn't open /etc/make.conf.old\n"; |
162 |
open my $makeconfold, '>', "${makeconfname}.old" or die "Couldn't open ${makeconfname}.old\n"; |
| 162 |
local $/; |
163 |
local $/; |
| 163 |
$_ = <$makeconf>; |
164 |
$_ = <$makeconf>; |
| 164 |
print $makeconfold $_; |
165 |
print $makeconfold $_; |
|
Lines 293-303
Link Here
|
| 293 |
die "Parse error when writing make.conf - did you modify it while ufed was running?\n" if $@; |
294 |
die "Parse error when writing make.conf - did you modify it while ufed was running?\n" if $@; |
| 294 |
|
295 |
|
| 295 |
print STDERR <<EOF if $sourcing; |
296 |
print STDERR <<EOF if $sourcing; |
| 296 |
Warning: source command found in /etc/make.conf. Flags may |
297 |
Warning: source command found in ${makeconfname}. Flags may |
| 297 |
be saved incorrectly if the sourced file modifies them. |
298 |
be saved incorrectly if the sourced file modifies them. |
| 298 |
EOF |
299 |
EOF |
| 299 |
{ |
300 |
{ |
| 300 |
open my $makeconf, '>', '/etc/make.conf' or die "Couldn't open /etc/make.conf\n"; |
301 |
open my $makeconf, '>', $makeconfname or die "Couldn't open $makeconfname\n"; |
| 301 |
print $makeconf $_; |
302 |
print $makeconf $_; |
| 302 |
close $makeconf; |
303 |
close $makeconf; |
| 303 |
} |
304 |
} |
