Properly filter parameter '-norequire'

jplesnik · Aug 17, 2022 · 25d1ffc · 25d1ffc
1 parent c8eeb83
commit 25d1ffc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/Changes b/Changes
@@ -2,6 +2,7 @@ Revision history for perl-generators.
 
 1.14  Wed Aug 17 2022
 - Find requires on 'BEGIN {' lines (BZ#2029995) - thanks Charles R. Anderson
+- Properly filter parameter '-norequire'
 
 1.13  Fri May  7 2021
 - Fix broken call to perl.prov when filenames contain spaces

diff --git a/t/data/list b/t/data/list
@@ -4,8 +4,12 @@ use base qw<Delta>;
 use parent 'Epsilon';
 use parent qw{Theta};
 
-# 'Zeta', 'Iota' should not be found
+# 'Zeta', 'Iota', 'Not::Require*' should not be found
 use parent -norequire, qw(Zeta Iota);
+use parent -norequire, 'Not::Require1', 'Not::Require2';
+use parent -norequire, 'Not::Require3';
+use parent qw/-norequire Not::Require4/;
+use parent '-norequire', 'Not::Require5';
 
 use aliased "Some::Crazy::Module";
 

diff --git a/template/bin/perl.req b/template/bin/perl.req
@@ -368,9 +368,11 @@ sub process_file {
         }
         next;
       }
+      # use parent -norequire, 'No::Version'; # $params == "-norequire,"
+      # use parent qw/-norequire XML::XPath::Node/; # $list == "-norequire XML::XPath::Node"
       if ($statement eq "use" && $module eq "parent") {
         add_require($module, $version);
-        if (defined($list) && $list ne "" && $params !~ /-norequire/) {
+        if (defined($list) && $list ne "" && $list !~ /-norequire/ && $params !~ /-norequire/) {
           add_require($_, undef) for split(' ', $list);
         }
         next;