|
Lines 43-49
Link Here
|
| 43 |
{ |
43 |
{ |
| 44 |
if ($break_if_found == 1) |
44 |
if ($break_if_found == 1) |
| 45 |
{ |
45 |
{ |
| 46 |
die('did not find USE in ' . $file); |
46 |
die('dd not find USE in ' . $file); |
| 47 |
} |
47 |
} |
| 48 |
|
48 |
|
| 49 |
return 'EMPTY'; |
49 |
return 'EMPTY'; |
|
Lines 66-72
Link Here
|
| 66 |
# @flags = get_use_flags() |
66 |
# @flags = get_use_flags() |
| 67 |
sub get_use_flags |
67 |
sub get_use_flags |
| 68 |
{ |
68 |
{ |
| 69 |
my @flags = get_use_flags_from_file('/etc/make.conf', 0); |
69 |
my @flags = get_use_flags_from_file('/etc/make.conf.d/use', 0); |
| 70 |
|
70 |
|
| 71 |
if (($#flags + 1) == 1) |
71 |
if (($#flags + 1) == 1) |
| 72 |
{ |
72 |
{ |
|
Lines 141-149
Link Here
|
| 141 |
|
141 |
|
| 142 |
# $onoff = get_onoff_conf($flag) |
142 |
# $onoff = get_onoff_conf($flag) |
| 143 |
# returns: |
143 |
# returns: |
| 144 |
# -1 if $flag is '-xyz' in make.conf |
144 |
# -1 if $flag is '-xyz' in make.conf.d/use |
| 145 |
# 0 if $flag is not in make.conf |
145 |
# 0 if $flag is not in make.conf.d/use |
| 146 |
# 1 if $flag is '+xyz' in make.conf |
146 |
# 1 if $flag is '+xyz' in make.conf.d/use |
| 147 |
sub get_onoff_conf |
147 |
sub get_onoff_conf |
| 148 |
{ |
148 |
{ |
| 149 |
my $flag = shift(); |
149 |
my $flag = shift(); |
|
Lines 312-322
Link Here
|
| 312 |
} |
312 |
} |
| 313 |
$use =~ s/^(.*)[ ]$/\1/; |
313 |
$use =~ s/^(.*)[ ]$/\1/; |
| 314 |
|
314 |
|
| 315 |
unlink('/etc/make.conf.old'); |
315 |
unlink('/etc/make.conf.d/use.old'); |
| 316 |
rename('/etc/make.conf', '/etc/make.conf.old'); |
316 |
rename('/etc/make.conf.d/use', '/etc/make.conf.d/use.old'); |
| 317 |
|
317 |
|
| 318 |
open(FILE, '/etc/make.conf.old') or die('couldn\'t open /etc/make.conf.old'); |
318 |
open(FILE, '/etc/make.conf.d/use.old') or die('couldn\'t open /etc/make.conf.d/use.old'); |
| 319 |
open(OUTFILE, '>/etc/make.conf') or die('couldn\'t open /etc/make.conf'); |
319 |
open(OUTFILE, '>/etc/make.conf.d/use') or die('couldn\'t open /etc/make.conf.d/use'); |
| 320 |
|
320 |
|
| 321 |
if ($use_in_conf == 1) |
321 |
if ($use_in_conf == 1) |
| 322 |
{ |
322 |
{ |
|
Lines 376-382
Link Here
|
| 376 |
close(OUTFILE); |
376 |
close(OUTFILE); |
| 377 |
close(FILE); |
377 |
close(FILE); |
| 378 |
|
378 |
|
| 379 |
chmod(0644, '/etc/make.conf'); |
379 |
chmod(0644, '/etc/make.conf.d/use'); |
| 380 |
} |
380 |
} |
| 381 |
|
381 |
|
| 382 |
|
382 |
|
|
Lines 488-493
Link Here
|
| 488 |
save_use_flags($selected_flags); |
488 |
save_use_flags($selected_flags); |
| 489 |
|
489 |
|
| 490 |
last; |
490 |
last; |
|
|
491 |
`update-make.conf` |
| 491 |
} |
492 |
} |
| 492 |
} |
493 |
} |
| 493 |
|
494 |
|
