[libcatmandu-perl] 64/85: Moving all error processing enhancements to a new branch

Jonas Smedegaard dr at jones.dk
Tue May 20 09:56:20 UTC 2014


This is an automated email from the git hooks/post-receive script.

js pushed a commit to tag 0.91
in repository libcatmandu-perl.

commit 65d29750708fa8abd4d03e831180e7d0c7fd674e
Author: Patrick Hochstenbach <patrick.hochstenbach at ugent.be>
Date:   Sat May 17 18:29:42 2014 +0200

    Moving all error processing enhancements to a new branch
---
 bin/catmandu        |  2 +-
 lib/Catmandu/CLI.pm | 27 +--------------------------
 2 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/bin/catmandu b/bin/catmandu
index e66c888..ad57a1c 100755
--- a/bin/catmandu
+++ b/bin/catmandu
@@ -5,7 +5,7 @@ use Catmandu::CLI;
 use Cwd ();
 
 Catmandu->default_load_path(Cwd::getcwd);
-Catmandu::CLI->run || exit 2;
+Catmandu::CLI->run;
 
 =head1 NAME
 
diff --git a/lib/Catmandu/CLI.pm b/lib/Catmandu/CLI.pm
index 41cb205..3f0365a 100644
--- a/lib/Catmandu/CLI.pm
+++ b/lib/Catmandu/CLI.pm
@@ -45,32 +45,7 @@ sub run {
     $self->set_global_options($global_opts);
     my ($cmd, $opts, @args) = $self->prepare_command(@$argv);
 
-    eval {
-        $self->execute_command($cmd, $opts, @args);
-    };
-    if ($@) {
-        if ($@ =~ /^Can't locate Catmandu\/Importer/ && $ARGV[1] eq 'help') {
-            print STDERR "You probably mean:\n\n\tcatmandu $ARGV[1] $ARGV[0]\n";
-            return undef;
-        }
-        elsif ($@ =~ /Can't locate Catmandu\/(Importer|Exporter|Store)\/([^\.]+)/) {
-            print STDERR "Can't find:\n\n\tCatmandu::$1\::$2\n\nin your installation. Or a\n\n\t$2\n\nin your catmandu.yml\n";
-            return undef;
-        }
-        elsif ($@ =~ /unknown store default/) {
-            print STDERR "You need to provide the type of a Store or define one in your catmandu.yml file.\n";
-            return undef;
-        }
-        elsif ($@ =~ /can't open "(.*)" for reading/) {
-            print STDERR "Can't find this Fix (file):\n\n\t$1\n\nDid you spell it correctly?\n";
-            return undef;
-        }
-        else {
-            die $@;
-        }
-    }
-    
-    1;
+    $self->execute_command($cmd, $opts, @args);
 }
 
 1;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libcatmandu-perl.git



More information about the Pkg-perl-cvs-commits mailing list