1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
|
--- ufed.pl.in
+++ ufed.pl.in
@@ -156,9 +156,11 @@
my (@flags) = @_;
my $contents;
+ my $makeconf_name = '/etc/make.conf';
+ $makeconf_name = '/etc/portage/make.conf' unless(-r $makeconf_name);
{
- open my $makeconf, '<', '/etc/make.conf' or die "Couldn't open /etc/make.conf\n";
- open my $makeconfold, '>', '/etc/make.conf.old' or die "Couldn't open /etc/make.conf.old\n";
+ open my $makeconf, '<', $makeconf_name or die "Couldn't open $makeconf_name\n";
+ open my $makeconfold, '>', $makeconf_name . '.old' or die "Couldn't open $makeconf_name.old\n";
local $/;
$_ = <$makeconf>;
print $makeconfold $_;
@@ -293,11 +295,11 @@
die "Parse error when writing make.conf - did you modify it while ufed was running?\n" if $@;
print STDERR <<EOF if $sourcing;
-Warning: source command found in /etc/make.conf. Flags may
+Warning: source command found in $makeconf_name. Flags may
be saved incorrectly if the sourced file modifies them.
EOF
{
- open my $makeconf, '>', '/etc/make.conf' or die "Couldn't open /etc/make.conf\n";
+ open my $makeconf, '>', $makeconf_name or die "Couldn't open $makeconf_name\n";
print $makeconf $_;
close $makeconf;
}
|