[pacman-dev] [PATCH] makepkg-template: Remove linenumber/file from errors

Florian Pritz bluewind at xinu.at
Sun Dec 28 15:06:14 UTC 2014


die prints "at $scriptname line $linenumber." if the string does not
end with "\n". This information is not of much use for us and it makes
testing harder because we'd to remove it there.

Signed-off-by: Florian Pritz <bluewind at xinu.at>
---
 scripts/makepkg-template.pl.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/makepkg-template.pl.in b/scripts/makepkg-template.pl.in
index d9da167..4bfd4d6 100755
--- a/scripts/makepkg-template.pl.in
+++ b/scripts/makepkg-template.pl.in
@@ -109,7 +109,7 @@ sub load_template {
 	my ($version) = (abs_path($path) =~ /-([0-9.]+)[.]template$/);
 
 	if (!$version) {
-		die sprintf(gettext("Couldn't detect version for template '%s'"), $values->{name});
+		die sprintf(gettext("Couldn't detect version for template '%s'\n"), $values->{name});
 	}
 
 	my $parsed = process_file($path);
@@ -128,7 +128,7 @@ sub process_file {
 	my $nesting_level = 0;
 	my $linenumber = 0;
 
-	open (my $fh, "<", $filename) or die sprintf(gettext("failed to open '%s': %s"), $filename, $!);
+	open (my $fh, "<", $filename) or die sprintf(gettext("failed to open '%s': %s\n"), $filename, $!);
 	my @lines = <$fh>;
 	close $fh;
 
-- 
2.2.1


More information about the pacman-dev mailing list