summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2014-12-28 15:56:53 +0100
committerAllan McRae <allan@archlinux.org>2015-01-11 09:58:24 +0100
commitf617b6acd4e33586819ac5728825cbdcac12f042 (patch)
tree04d20efb3ea10849380603f61961601f10fe1f0d
parent77ca6e40622cea463c601566a85b40ebaea69598 (diff)
downloadpacman-f617b6acd4e33586819ac5728825cbdcac12f042.tar.gz
pacman-f617b6acd4e33586819ac5728825cbdcac12f042.tar.xz
makepkg-template: Remove linenumber/file from errors
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@xinu.at>
-rwxr-xr-xscripts/makepkg-template.pl.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/makepkg-template.pl.in b/scripts/makepkg-template.pl.in
index d9da1674..4bfd4d6a 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;