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

[Sven Eden]

commit:     583d6c70e4e06a60445a0f9e744914c96f14c79a
Author:     Sven Eden <yamakuzure <AT> gmx <DOT> net>
AuthorDate: Mon Nov 25 08:08:22 2013 +0000
Commit:     Sven Eden <sven.eden <AT> gmx <DOT> de>
CommitDate: Mon Nov 25 08:08:22 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/ufed.git;a=commit;h=583d6c70

ufed.pl/Portage.pm: Parsing error messages from eval are now chomp'ed

---
 Portage.pm | 4 ++--
 ufed.pl.in | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Portage.pm b/Portage.pm
index e9edaab..d3bed35 100644
--- a/Portage.pm
+++ b/Portage.pm
@@ -999,8 +999,8 @@ sub _read_sh {
 				}
 			}
 		};
-		defined($@) and length($@) and
-			die "Parse error in $fname\n - Error: \"$@\"\n";
+		defined($@) and length($@) and chomp $@
+			and die "Parse error in $fname\n - Error: \"$@\"\n";
 	}
 	_merge_env(\%env);
 	return %env if wantarray;

diff --git a/ufed.pl.in b/ufed.pl.in
index 37f7957..3d1e354 100644
--- a/ufed.pl.in
+++ b/ufed.pl.in
@@ -335,7 +335,8 @@ sub save_flags {
 			}
 		}
 	};
-	defined($@) and length($@) and die "\nParse error when writing make.conf"
+	defined($@) and length($@) and chomp $@
+		and die "\nParse error when writing make.conf"
 		. " - did you modify it while ufed was running?\n"
 		. " - Error: \"$@\"\n";