[patch] Write into correct make.conf

ufed-0.40.1-make.conf-write.patch (text/plain), 1.16 KB, created by Martin Väth on 2012-10-15 17:47:37 UTC

--- 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;
 	}