|
Line
Link Here
|
| 0 |
-- ufed.pl.in |
0 |
++ ufed.pl.in |
|
Lines 156-164
Link Here
|
| 156 |
my (@flags) = @_; |
156 |
my (@flags) = @_; |
| 157 |
my $contents; |
157 |
my $contents; |
| 158 |
|
158 |
|
|
|
159 |
my $makeconf_name = '/etc/make.conf'; |
| 160 |
$makeconf_name = '/etc/portage/make.conf' unless(-r $makeconf_name); |
| 159 |
{ |
161 |
{ |
| 160 |
open my $makeconf, '<', '/etc/make.conf' or die "Couldn't open /etc/make.conf\n"; |
162 |
open my $makeconf, '<', $makeconf_name or die "Couldn't open $makeconf_name\n"; |
| 161 |
open my $makeconfold, '>', '/etc/make.conf.old' or die "Couldn't open /etc/make.conf.old\n"; |
163 |
open my $makeconfold, '>', $makeconf_name . '.old' or die "Couldn't open $makeconf_name.old\n"; |
| 162 |
local $/; |
164 |
local $/; |
| 163 |
$_ = <$makeconf>; |
165 |
$_ = <$makeconf>; |
| 164 |
print $makeconfold $_; |
166 |
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 $@; |
295 |
die "Parse error when writing make.conf - did you modify it while ufed was running?\n" if $@; |
| 294 |
|
296 |
|
| 295 |
print STDERR <<EOF if $sourcing; |
297 |
print STDERR <<EOF if $sourcing; |
| 296 |
Warning: source command found in /etc/make.conf. Flags may |
298 |
Warning: source command found in $makeconf_name. Flags may |
| 297 |
be saved incorrectly if the sourced file modifies them. |
299 |
be saved incorrectly if the sourced file modifies them. |
| 298 |
EOF |
300 |
EOF |
| 299 |
{ |
301 |
{ |
| 300 |
open my $makeconf, '>', '/etc/make.conf' or die "Couldn't open /etc/make.conf\n"; |
302 |
open my $makeconf, '>', $makeconf_name or die "Couldn't open $makeconf_name\n"; |
| 301 |
print $makeconf $_; |
303 |
print $makeconf $_; |
| 302 |
close $makeconf; |
304 |
close $makeconf; |
| 303 |
} |
305 |
} |
