[gentoo-commits] proj/ufed:master commit in: /

["Sven Eden" <sven.eden@gmx.de>]

commit:     ddbb4ba7b3cadc9dd1f237fa79da058fdc201e2b
Author:     Sven Eden <yamakuzure <AT> gmx <DOT> net>
AuthorDate: Mon Sep  9 13:45:25 2013 +0000
Commit:     Sven Eden <sven.eden <AT> gmx <DOT> de>
CommitDate: Mon Sep  9 13:45:25 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/ufed.git;a=commit;h=ddbb4ba7

ufed no longer tries to write out use flags if the new $Portage::ro_mode is not set to 0.

---
 ufed.pl.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ufed.pl.in b/ufed.pl.in
index 5f10a22..a922109 100644
--- a/ufed.pl.in
+++ b/ufed.pl.in
@@ -128,12 +128,12 @@ sub flags_dialog {
 	wait;
 	if(POSIX::WIFEXITED($?)) {
 		my $rc = POSIX::WEXITSTATUS($?);
-		if($rc==0) {
+		if( (0 == $rc) && (0 == $Portage::ro_mode) ) {
 			open my $fh, '<&=', $oread or die "Couldn't read output.\n";
 			my @flags = grep { $_ ne '--*' } do { local $/; split /\n/, <$fh> };
 			close $fh;
 			save_flags finalise @flags;
-		} elsif($rc==1) {
+		} elsif( 1 == $rc ) {
 			print "Cancelled, not saving changes.\n";
 		}
 		exit $rc;
@@ -169,7 +169,7 @@ sub save_flags {
 	my $makeconf_name = $Portage::used_make_conf;
 	{
 		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";
+		open my $makeconfold, '>', $makeconf_name . '~' or die "Couldn't open ${makeconf_name}~\n";
 		local $/;
 		$_ = <$makeconf>;
 		print $makeconfold $_;