Change --debug option to have levels of detail

(cherry picked from commit d62bda55bbfa2de367141dce1774eed7db9c3b64)
Signed-off-by: Nicolas R <atoomic@cpan.org>

5 files changed, 8 insertions, 10 deletions

diff --git a/dist/Devel-PPPort/devel/devtools.pl b/dist/Devel-PPPort/devel/devtools.pl
index 3f24595595..4e4fa21e97 100644
--- a/dist/Devel-PPPort/devel/devtools.pl
+++ b/dist/Devel-PPPort/devel/devtools.pl
@@ -89,9 +89,7 @@ sub run
       ||  exists $rval{signal}
       || ($rval{status} && @{$rval{stderr}})
       || ($opt{debug} && @{$rval{stderr}})
-
-          # verbose increases likelihood of output
-      || ($opt{debug} && $opt{verbose} && @{$rval{stdout}}))
+      || ($opt{debug} > 2 && @{$rval{stdout}}))
   {
     print STDERR "Returning\n", Dumper \%rval;
 
diff --git a/dist/Devel-PPPort/devel/mktodo b/dist/Devel-PPPort/devel/mktodo
index 800a7cc468..88b9eb62ee 100755
--- a/dist/Devel-PPPort/devel/mktodo
+++ b/dist/Devel-PPPort/devel/mktodo
@@ -52,7 +52,7 @@ our %opt = (
 # ppport.h, so we get, as patched by ppport.h, what gets added when
 
 GetOptions(\%opt, qw( base check! verbose install=s blead=s blead-version=s
-                      debug debug-start=s)) or die;
+                      debug=i debug-start=s)) or die;
 
 identify();
 
@@ -68,7 +68,7 @@ for (@${perls_ref}) {
   push @args, '--blead' if $_ == $perls_ref->[0];   # First one is blead
   push @args, '--todo', $_->{'todo'};
   push @args, '--base' if $opt{base};
-  push @args, '--debug' if $opt{debug};
+  push @args, "--debug=$opt{debug}" if $opt{debug};
   push @args, '--verbose' if $opt{verbose};
   push @args, '--nocheck' unless $opt{check};
   runperl('devel/mktodo.pl', @args) or die "error running mktodo.pl [$!] [$?]\n";
diff --git a/dist/Devel-PPPort/devel/mktodo.pl b/dist/Devel-PPPort/devel/mktodo.pl
index 43357ec1ba..077de099f4 100644
--- a/dist/Devel-PPPort/devel/mktodo.pl
+++ b/dist/Devel-PPPort/devel/mktodo.pl
@@ -28,7 +28,7 @@ require './devel/devtools.pl';
 
 our %opt = (
   blead     => 0,     # ? Is this perl blead
-  debug   => 0,     # Adding --verbose increases the detail
+  debug   => 0,
   base    => 0,     # Don't use ppport.h when generating
   verbose => 0,
   check   => 1,
@@ -37,7 +37,7 @@ our %opt = (
 );
 
 GetOptions(\%opt, qw(
-perl=s todo=s blead version=s shlib=s debug base verbose check!
+perl=s todo=s blead version=s shlib=s debug=i base verbose check!
           )) or die;
 
 identify();
diff --git a/dist/Devel-PPPort/devel/regenerate b/dist/Devel-PPPort/devel/regenerate
index 4d81859a53..63718db56f 100755
--- a/dist/Devel-PPPort/devel/regenerate
+++ b/dist/Devel-PPPort/devel/regenerate
@@ -29,7 +29,7 @@ our %opt = (
 );
 
 GetOptions(\%opt, qw( check! verbose install=s blead=s blead-version=s
-                      debug debug-start=s)) or die pod2usage();
+                      debug=i debug-start=s)) or die pod2usage();
 
 identify();
 
@@ -80,7 +80,7 @@ for my $dir (qw( base todo )) {
 }
 
 my @perlargs;
-push @perlargs, "--debug" if $opt{debug};
+push @perlargs, "--debug=$opt{debug}" if $opt{debug};
 push @perlargs, "--install=$opt{install}" if $opt{install};
 push @perlargs, "--blead=$opt{blead}" if $opt{blead};
 push @perlargs, "--debug-start=$opt{'debug-start'}" if $opt{'debug-start'};
diff --git a/dist/Devel-PPPort/devel/scanprov b/dist/Devel-PPPort/devel/scanprov
index 48e287f438..85da7f768c 100755
--- a/dist/Devel-PPPort/devel/scanprov
+++ b/dist/Devel-PPPort/devel/scanprov
@@ -29,7 +29,7 @@ our %opt = (
  'debug-start' => "",
 );
 
-GetOptions(\%opt, qw( install=s mode=s blead=s debug debug-start=s)) or die;
+GetOptions(\%opt, qw( install=s mode=s blead=s debug=i debug-start=s)) or die;
 
 my $write = $opt{mode} eq 'write';