From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-643376-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 17B14138247
	for <garchives@archives.gentoo.org>; Mon, 25 Nov 2013 21:43:30 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 4DBBCE0A41;
	Mon, 25 Nov 2013 21:43:29 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id B710BE0AC2
	for <gentoo-commits@lists.gentoo.org>; Mon, 25 Nov 2013 21:43:28 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id B936A33F38C
	for <gentoo-commits@lists.gentoo.org>; Mon, 25 Nov 2013 21:43:27 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by hornbill.gentoo.org (Postfix) with ESMTP id 6AE27E5462
	for <gentoo-commits@lists.gentoo.org>; Mon, 25 Nov 2013 21:43:26 +0000 (UTC)
From: "Sven Eden" <sven.eden@gmx.de>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sven Eden" <sven.eden@gmx.de>
Message-ID: <1385366902.583d6c70e4e06a60445a0f9e744914c96f14c79a.yamakuzure@gentoo>
Subject: [gentoo-commits] proj/ufed:master commit in: /
X-VCS-Repository: proj/ufed
X-VCS-Files: Portage.pm ufed.pl.in
X-VCS-Directories: /
X-VCS-Committer: yamakuzure
X-VCS-Committer-Name: Sven Eden
X-VCS-Revision: 583d6c70e4e06a60445a0f9e744914c96f14c79a
X-VCS-Branch: master
Date: Mon, 25 Nov 2013 21:43:26 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: bc0c6391-0a27-4201-a89f-4050339103b3
X-Archives-Hash: b4436daec729e126e190c0a7f78a85a1

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