From: Dietmar Maurer <dietmar@proxmox.com>
Date: Fri, 9 Oct 2015 06:38:37 +0000 (+0200)
Subject: parse_property_string: add newline to error strings
X-Git-Url: https://git.proxmox.com/?p=pve-common.git;a=commitdiff_plain;h=2d468b1aa2de0a6d4029cb072b1c1fec36adefed

parse_property_string: add newline to error strings

to prevent perl from adding 'at line xxx'
---

diff --git a/src/PVE/JSONSchema.pm b/src/PVE/JSONSchema.pm
index 0cb281d..e84c661 100644
--- a/src/PVE/JSONSchema.pm
+++ b/src/PVE/JSONSchema.pm
@@ -498,16 +498,16 @@ sub parse_property_string {
 
 	if ($part =~ /^([^=]+)=(.+)$/) {
 	    my ($k, $v) = ($1, $2);
-	    die "duplicate key in comma-separated list property: $k" if defined($res->{$k});
+	    die "duplicate key in comma-separated list property: $k\n" if defined($res->{$k});
 	    my $schema = $format->{$k};
-	    die "invalid key in comma-separated list property: $k" if !$schema;
+	    die "invalid key in comma-separated list property: $k\n" if !$schema;
 	    if ($schema->{type} && $schema->{type} eq 'boolean') {
 		$v = 1 if $v =~ m/^(1|on|yes|true)$/i;
 		$v = 0 if $v =~ m/^(0|off|no|false)$/i;
 	    }
 	    $res->{$k} = $v;
 	} elsif ($part !~ /=/) {
-	    die "duplicate key in comma-separated list property: $default_key" if $default_key;
+	    die "duplicate key in comma-separated list property: $default_key\n" if $default_key;
 	    foreach my $key (keys %$format) {
 		if ($format->{$key}->{default_key}) {
 		    $default_key = $key;
@@ -515,18 +515,18 @@ sub parse_property_string {
 			$res->{$default_key} = $part;
 			last;
 		    }
-		    die "duplicate key in comma-separated list property: $default_key";
+		    die "duplicate key in comma-separated list property: $default_key\n";
 		}
 	    }
 	} else {
-	    die "missing key in comma-separated list property";
+	    die "missing key in comma-separated list property\n";
 	}
     }
 
     my $errors = {};
     check_object($path, $format, $res, undef, $errors);
     if (scalar(%$errors)) {
-	raise "format error", errors => $errors;
+	raise "format error\n", errors => $errors;
     }
 
     return $res;