Changed optionparser to allow for default: no to be false and run update-modules #PT-2457

2025-09-01 18:25:59 +00:00 · 2025-06-25 10:55:24 +10:00
parent d0d046122b
commit 6c9ed6ed5b
25 changed files with 75 additions and 25 deletions
--- a/bin/pt-align
+++ b/bin/pt-align
@@ -319,7 +319,9 @@ sub _parse_specs {
         $opt->{spec} =~ s/=./=s/ if ( $type && $type =~ m/[HhAadzm]/ );

         if ( (my ($def) = $opt->{desc} =~ m/default\b(?: ([^)]+))?/) ) {
-            $self->{defaults}->{$long} = defined $def ? $def : 1;
+            $def = defined $def ? $def : 1;
+            $def = $def eq 'yes' ? 1 : $def eq 'no' ? 0 : $def;
+            $self->{defaults}->{$long} = $def;
            PTDEBUG && _d($long, 'default:', $def);
         }

--- a/bin/pt-archiver
+++ b/bin/pt-archiver
@@ -1048,7 +1048,9 @@ sub _parse_specs {
         $opt->{spec} =~ s/=./=s/ if ( $type && $type =~ m/[HhAadzm]/ );

         if ( (my ($def) = $opt->{desc} =~ m/default\b(?: ([^)]+))?/) ) {
-            $self->{defaults}->{$long} = defined $def ? $def : 1;
+            $def = defined $def ? $def : 1;
+            $def = $def eq 'yes' ? 1 : $def eq 'no' ? 0 : $def;
+            $self->{defaults}->{$long} = $def;
            PTDEBUG && _d($long, 'default:', $def);
         }

--- a/bin/pt-config-diff
+++ b/bin/pt-config-diff
@@ -1046,7 +1046,9 @@ sub _parse_specs {
         $opt->{spec} =~ s/=./=s/ if ( $type && $type =~ m/[HhAadzm]/ );

         if ( (my ($def) = $opt->{desc} =~ m/default\b(?: ([^)]+))?/) ) {
-            $self->{defaults}->{$long} = defined $def ? $def : 1;
+            $def = defined $def ? $def : 1;
+            $def = $def eq 'yes' ? 1 : $def eq 'no' ? 0 : $def;
+            $self->{defaults}->{$long} = $def;
            PTDEBUG && _d($long, 'default:', $def);
         }

--- a/bin/pt-deadlock-logger
+++ b/bin/pt-deadlock-logger
@@ -396,7 +396,9 @@ sub _parse_specs {
         $opt->{spec} =~ s/=./=s/ if ( $type && $type =~ m/[HhAadzm]/ );

         if ( (my ($def) = $opt->{desc} =~ m/default\b(?: ([^)]+))?/) ) {
-            $self->{defaults}->{$long} = defined $def ? $def : 1;
+            $def = defined $def ? $def : 1;
+            $def = $def eq 'yes' ? 1 : $def eq 'no' ? 0 : $def;
+            $self->{defaults}->{$long} = $def;
            PTDEBUG && _d($long, 'default:', $def);
         }

--- a/bin/pt-diskstats
+++ b/bin/pt-diskstats
@@ -392,7 +392,9 @@ sub _parse_specs {
         $opt->{spec} =~ s/=./=s/ if ( $type && $type =~ m/[HhAadzm]/ );

         if ( (my ($def) = $opt->{desc} =~ m/default\b(?: ([^)]+))?/) ) {
-            $self->{defaults}->{$long} = defined $def ? $def : 1;
+            $def = defined $def ? $def : 1;
+            $def = $def eq 'yes' ? 1 : $def eq 'no' ? 0 : $def;
+            $self->{defaults}->{$long} = $def;
            PTDEBUG && _d($long, 'default:', $def);
         }

--- a/bin/pt-duplicate-key-checker
+++ b/bin/pt-duplicate-key-checker
@@ -1451,7 +1451,9 @@ sub _parse_specs {
         $opt->{spec} =~ s/=./=s/ if ( $type && $type =~ m/[HhAadzm]/ );

         if ( (my ($def) = $opt->{desc} =~ m/default\b(?: ([^)]+))?/) ) {
-            $self->{defaults}->{$long} = defined $def ? $def : 1;
+            $def = defined $def ? $def : 1;
+            $def = $def eq 'yes' ? 1 : $def eq 'no' ? 0 : $def;
+            $self->{defaults}->{$long} = $def;
            PTDEBUG && _d($long, 'default:', $def);
         }

--- a/bin/pt-fifo-split
+++ b/bin/pt-fifo-split
@@ -320,7 +320,9 @@ sub _parse_specs {
         $opt->{spec} =~ s/=./=s/ if ( $type && $type =~ m/[HhAadzm]/ );

         if ( (my ($def) = $opt->{desc} =~ m/default\b(?: ([^)]+))?/) ) {
-            $self->{defaults}->{$long} = defined $def ? $def : 1;
+            $def = defined $def ? $def : 1;
+            $def = $def eq 'yes' ? 1 : $def eq 'no' ? 0 : $def;
+            $self->{defaults}->{$long} = $def;
            PTDEBUG && _d($long, 'default:', $def);
         }

--- a/bin/pt-find
+++ b/bin/pt-find
@@ -839,7 +839,9 @@ sub _parse_specs {
         $opt->{spec} =~ s/=./=s/ if ( $type && $type =~ m/[HhAadzm]/ );

         if ( (my ($def) = $opt->{desc} =~ m/default\b(?: ([^)]+))?/) ) {
-            $self->{defaults}->{$long} = defined $def ? $def : 1;
+            $def = defined $def ? $def : 1;
+            $def = $def eq 'yes' ? 1 : $def eq 'no' ? 0 : $def;
+            $self->{defaults}->{$long} = $def;
            PTDEBUG && _d($long, 'default:', $def);
         }

--- a/bin/pt-fingerprint
+++ b/bin/pt-fingerprint
@@ -321,7 +321,9 @@ sub _parse_specs {
         $opt->{spec} =~ s/=./=s/ if ( $type && $type =~ m/[HhAadzm]/ );

         if ( (my ($def) = $opt->{desc} =~ m/default\b(?: ([^)]+))?/) ) {
-            $self->{defaults}->{$long} = defined $def ? $def : 1;
+            $def = defined $def ? $def : 1;
+            $def = $def eq 'yes' ? 1 : $def eq 'no' ? 0 : $def;
+            $self->{defaults}->{$long} = $def;
            PTDEBUG && _d($long, 'default:', $def);
         }

--- a/bin/pt-fk-error-logger
+++ b/bin/pt-fk-error-logger
@@ -391,7 +391,9 @@ sub _parse_specs {
         $opt->{spec} =~ s/=./=s/ if ( $type && $type =~ m/[HhAadzm]/ );

         if ( (my ($def) = $opt->{desc} =~ m/default\b(?: ([^)]+))?/) ) {
-            $self->{defaults}->{$long} = defined $def ? $def : 1;
+            $def = defined $def ? $def : 1;
+            $def = $def eq 'yes' ? 1 : $def eq 'no' ? 0 : $def;
+            $self->{defaults}->{$long} = $def;
            PTDEBUG && _d($long, 'default:', $def);
         }

--- a/bin/pt-heartbeat
+++ b/bin/pt-heartbeat
@@ -1349,7 +1349,9 @@ sub _parse_specs {
         $opt->{spec} =~ s/=./=s/ if ( $type && $type =~ m/[HhAadzm]/ );

         if ( (my ($def) = $opt->{desc} =~ m/default\b(?: ([^)]+))?/) ) {
-            $self->{defaults}->{$long} = defined $def ? $def : 1;
+            $def = defined $def ? $def : 1;
+            $def = $def eq 'yes' ? 1 : $def eq 'no' ? 0 : $def;
+            $self->{defaults}->{$long} = $def;
            PTDEBUG && _d($long, 'default:', $def);
         }

--- a/bin/pt-index-usage
+++ b/bin/pt-index-usage
@@ -1005,7 +1005,9 @@ sub _parse_specs {
         $opt->{spec} =~ s/=./=s/ if ( $type && $type =~ m/[HhAadzm]/ );

         if ( (my ($def) = $opt->{desc} =~ m/default\b(?: ([^)]+))?/) ) {
-            $self->{defaults}->{$long} = defined $def ? $def : 1;
+            $def = defined $def ? $def : 1;
+            $def = $def eq 'yes' ? 1 : $def eq 'no' ? 0 : $def;
+            $self->{defaults}->{$long} = $def;
            PTDEBUG && _d($long, 'default:', $def);
         }

--- a/bin/pt-kill
+++ b/bin/pt-kill
@@ -401,7 +401,9 @@ sub _parse_specs {
         $opt->{spec} =~ s/=./=s/ if ( $type && $type =~ m/[HhAadzm]/ );

         if ( (my ($def) = $opt->{desc} =~ m/default\b(?: ([^)]+))?/) ) {
-            $self->{defaults}->{$long} = defined $def ? $def : 1;
+            $def = defined $def ? $def : 1;
+            $def = $def eq 'yes' ? 1 : $def eq 'no' ? 0 : $def;
+            $self->{defaults}->{$long} = $def;
            PTDEBUG && _d($long, 'default:', $def);
         }

--- a/bin/pt-query-digest
+++ b/bin/pt-query-digest
@@ -1673,7 +1673,9 @@ sub _parse_specs {
         $opt->{spec} =~ s/=./=s/ if ( $type && $type =~ m/[HhAadzm]/ );

         if ( (my ($def) = $opt->{desc} =~ m/default\b(?: ([^)]+))?/) ) {
-            $self->{defaults}->{$long} = defined $def ? $def : 1;
+            $def = defined $def ? $def : 1;
+            $def = $def eq 'yes' ? 1 : $def eq 'no' ? 0 : $def;
+            $self->{defaults}->{$long} = $def;
            PTDEBUG && _d($long, 'default:', $def);
         }

--- a/bin/pt-replica-find
+++ b/bin/pt-replica-find
@@ -329,7 +329,9 @@ sub _parse_specs {
         $opt->{spec} =~ s/=./=s/ if ( $type && $type =~ m/[HhAadzm]/ );

         if ( (my ($def) = $opt->{desc} =~ m/default\b(?: ([^)]+))?/) ) {
-            $self->{defaults}->{$long} = defined $def ? $def : 1;
+            $def = defined $def ? $def : 1;
+            $def = $def eq 'yes' ? 1 : $def eq 'no' ? 0 : $def;
+            $self->{defaults}->{$long} = $def;
            PTDEBUG && _d($long, 'default:', $def);
         }

--- a/bin/pt-replica-restart
+++ b/bin/pt-replica-restart
@@ -551,7 +551,9 @@ sub _parse_specs {
         $opt->{spec} =~ s/=./=s/ if ( $type && $type =~ m/[HhAadzm]/ );

         if ( (my ($def) = $opt->{desc} =~ m/default\b(?: ([^)]+))?/) ) {
-            $self->{defaults}->{$long} = defined $def ? $def : 1;
+            $def = defined $def ? $def : 1;
+            $def = $def eq 'yes' ? 1 : $def eq 'no' ? 0 : $def;
+            $self->{defaults}->{$long} = $def;
            PTDEBUG && _d($long, 'default:', $def);
         }

--- a/bin/pt-show-grants
+++ b/bin/pt-show-grants
@@ -322,7 +322,9 @@ sub _parse_specs {
         $opt->{spec} =~ s/=./=s/ if ( $type && $type =~ m/[HhAadzm]/ );

         if ( (my ($def) = $opt->{desc} =~ m/default\b(?: ([^)]+))?/) ) {
-            $self->{defaults}->{$long} = defined $def ? $def : 1;
+            $def = defined $def ? $def : 1;
+            $def = $def eq 'yes' ? 1 : $def eq 'no' ? 0 : $def;
+            $self->{defaults}->{$long} = $def;
            PTDEBUG && _d($long, 'default:', $def);
         }

--- a/bin/pt-slave-delay
+++ b/bin/pt-slave-delay
@@ -395,7 +395,9 @@ sub _parse_specs {
         $opt->{spec} =~ s/=./=s/ if ( $type && $type =~ m/[HhAadzm]/ );

         if ( (my ($def) = $opt->{desc} =~ m/default\b(?: ([^)]+))?/) ) {
-            $self->{defaults}->{$long} = defined $def ? $def : 1;
+            $def = defined $def ? $def : 1;
+            $def = $def eq 'yes' ? 1 : $def eq 'no' ? 0 : $def;
+            $self->{defaults}->{$long} = $def;
            PTDEBUG && _d($long, 'default:', $def);
         }

--- a/bin/pt-table-checksum
+++ b/bin/pt-table-checksum
@@ -2155,7 +2155,9 @@ sub _parse_specs {
         $opt->{spec} =~ s/=./=s/ if ( $type && $type =~ m/[HhAadzm]/ );

         if ( (my ($def) = $opt->{desc} =~ m/default\b(?: ([^)]+))?/) ) {
-            $self->{defaults}->{$long} = defined $def ? $def : 1;
+            $def = defined $def ? $def : 1;
+            $def = $def eq 'yes' ? 1 : $def eq 'no' ? 0 : $def;
+            $self->{defaults}->{$long} = $def;
            PTDEBUG && _d($long, 'default:', $def);
         }

--- a/bin/pt-table-sync
+++ b/bin/pt-table-sync
@@ -409,7 +409,9 @@ sub _parse_specs {
         $opt->{spec} =~ s/=./=s/ if ( $type && $type =~ m/[HhAadzm]/ );

         if ( (my ($def) = $opt->{desc} =~ m/default\b(?: ([^)]+))?/) ) {
-            $self->{defaults}->{$long} = defined $def ? $def : 1;
+            $def = defined $def ? $def : 1;
+            $def = $def eq 'yes' ? 1 : $def eq 'no' ? 0 : $def;
+            $self->{defaults}->{$long} = $def;
            PTDEBUG && _d($long, 'default:', $def);
         }

--- a/bin/pt-table-usage
+++ b/bin/pt-table-usage
@@ -1441,7 +1441,9 @@ sub _parse_specs {
         $opt->{spec} =~ s/=./=s/ if ( $type && $type =~ m/[HhAadzm]/ );

         if ( (my ($def) = $opt->{desc} =~ m/default\b(?: ([^)]+))?/) ) {
-            $self->{defaults}->{$long} = defined $def ? $def : 1;
+            $def = defined $def ? $def : 1;
+            $def = $def eq 'yes' ? 1 : $def eq 'no' ? 0 : $def;
+            $self->{defaults}->{$long} = $def;
            PTDEBUG && _d($long, 'default:', $def);
         }

--- a/bin/pt-upgrade
+++ b/bin/pt-upgrade
@@ -1670,7 +1670,9 @@ sub _parse_specs {
         $opt->{spec} =~ s/=./=s/ if ( $type && $type =~ m/[HhAadzm]/ );

         if ( (my ($def) = $opt->{desc} =~ m/default\b(?: ([^)]+))?/) ) {
-            $self->{defaults}->{$long} = defined $def ? $def : 1;
+            $def = defined $def ? $def : 1;
+            $def = $def eq 'yes' ? 1 : $def eq 'no' ? 0 : $def;
+            $self->{defaults}->{$long} = $def;
            PTDEBUG && _d($long, 'default:', $def);
         }

--- a/bin/pt-variable-advisor
+++ b/bin/pt-variable-advisor
@@ -398,7 +398,9 @@ sub _parse_specs {
         $opt->{spec} =~ s/=./=s/ if ( $type && $type =~ m/[HhAadzm]/ );

         if ( (my ($def) = $opt->{desc} =~ m/default\b(?: ([^)]+))?/) ) {
-            $self->{defaults}->{$long} = defined $def ? $def : 1;
+            $def = defined $def ? $def : 1;
+            $def = $def eq 'yes' ? 1 : $def eq 'no' ? 0 : $def;
+            $self->{defaults}->{$long} = $def;
            PTDEBUG && _d($long, 'default:', $def);
         }

--- a/bin/pt-visual-explain
+++ b/bin/pt-visual-explain
@@ -1008,7 +1008,9 @@ sub _parse_specs {
         $opt->{spec} =~ s/=./=s/ if ( $type && $type =~ m/[HhAadzm]/ );

         if ( (my ($def) = $opt->{desc} =~ m/default\b(?: ([^)]+))?/) ) {
-            $self->{defaults}->{$long} = defined $def ? $def : 1;
+            $def = defined $def ? $def : 1;
+            $def = $def eq 'yes' ? 1 : $def eq 'no' ? 0 : $def;
+            $self->{defaults}->{$long} = $def;
            PTDEBUG && _d($long, 'default:', $def);
         }

--- a/lib/OptionParser.pm
+++ b/lib/OptionParser.pm
@@ -406,7 +406,9 @@ sub _parse_specs {
         # These defaults from the POD may be overridden by later calls
         # to set_defaults().
         if ( (my ($def) = $opt->{desc} =~ m/default\b(?: ([^)]+))?/) ) {
-            $self->{defaults}->{$long} = defined $def ? $def : 1;
+            $def = defined $def ? $def : 1;
+            $def = $def eq 'yes' ? 1 : $def eq 'no' ? 0 : $def;
+            $self->{defaults}->{$long} = $def;
            PTDEBUG && _d($long, 'default:', $def);
         }