ms-planner*: Improve debugging a bit

* Use confess a few times instead of die
* Fix failure of ms-planner-debug to DTRT

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>

diff --git a/ms-planner b/ms-planner
index 2b8b6c2ea388f94b71b71288dc713540f8931223..e56f0ea7b41ec7b63e042d759c3cf2a206a5d967 100755 (executable)
--- a/ms-planner
+++ b/ms-planner
@@ -487,9 +487,9 @@ sub parse_xinfo ($$) {
 
 sub parse_number ($) {
     my ($num) = @_;
-    die unless defined $num;
-    die if ref $num;
-    die unless $num =~ m/^(0|[1-9][0-9]{0,8})$/;
+    confess unless defined $num;
+    confess if ref $num;
+    confess unless $num =~ m/^(0|[1-9][0-9]{0,8})$/;
     return $num + 0;
 }
 

diff --git a/ms-planner-debug b/ms-planner-debug
index c82666d109de727f4fb4f37daf308bbe43bd92b9..715407790ebeed0a2f5990b9550da4377391fdd6 100755 (executable)
--- a/ms-planner-debug
+++ b/ms-planner-debug
@@ -52,7 +52,7 @@ foreach my $arg (@ARGV) {
 
 print "==========data-$walker.pl==========\n";
 
-system 'cat data-$walker.pl 2>&1';
+system "cat data-$walker.pl 2>&1";
 
 print "==========resources==========\n";