X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMooseX-Getopt.git;a=blobdiff_plain;f=lib%2FMooseX%2FGetopt.pm;h=b942d840cf9a0dd4733d7ff9ee9b2d0543530ddb;hp=1dedd874ef9eb5cd90cdb7d3f31ab4bb38aaccdb;hb=2860acacd4533c98fd1abb3057243c1f7b0d9ad4;hpb=8df55e62a4d1278fab4366b2516ecc673820a1f6 diff --git a/lib/MooseX/Getopt.pm b/lib/MooseX/Getopt.pm index 1dedd87..b942d84 100644 --- a/lib/MooseX/Getopt.pm +++ b/lib/MooseX/Getopt.pm @@ -88,10 +88,9 @@ sub _parse_argv { # Get a clean copy of the original @ARGV my $argv_copy = [ @ARGV ]; - my @err; - + my @warnings; my ( $parsed_options, $usage ) = eval { - local $SIG{__WARN__} = sub { push @err, @_ }; + local $SIG{__WARN__} = sub { push @warnings, @_ }; if ( HAVE_GLD ) { return Getopt::Long::Descriptive::describe_options($class->_usage_format(%params), @$opt_spec); @@ -102,7 +101,8 @@ sub _parse_argv { } }; - die join "", grep { defined } @err, $@ if @err or $@; + $class->_getopt_spec_warnings(@warnings) if @warnings; + $class->_getopt_spec_exception(\@warnings, $@) if $@; # Get a copy of the Getopt::Long-mangled @ARGV my $argv_mangled = [ @ARGV ]; @@ -121,6 +121,13 @@ sub _parse_argv { ); } +sub _getopt_spec_warnings { } + +sub _getopt_spec_exception { + my ($self, $warnings, $exception) = @_; + die @$warnings, $exception; +} + sub _usage_format { return "usage: %c %o"; }