]>
Commit | Line | Data |
---|---|---|
3765c6cd | 1 | --- rpm-5.1.4/scripts/perl.req 2008-08-20 21:27:09.929116479 +0200 |
8e25706d | 2 | +++ rpm-5.1.4/scripts/perl.req 2008-10-26 10:48:31.529709016 +0100 |
3 | @@ -196,7 +196,28 @@ | |
04ff144d | 4 | } |
5 | } | |
6 | ||
7 | - if ( | |
8 | + # handle "use base qw/ foo::bar baz::blah /;" and variations | |
9 | + if ( | |
8e25706d | 10 | + m/^ \s* use \s+ base |
8b887207 | 11 | + (?: \s+ q[wq]? \s* ( [!@#\$%^&*'"\/+=`~,.?-] ) \s* ( [\w:]+? (?: \s+[\w:]+? )*? ) \s* \1 |
04ff144d | 12 | + | |
8b887207 | 13 | + \s* ( ["'] ) ( [\w:]+? ) \3 |
04ff144d | 14 | + | |
15 | + # qw[], qw(), qw<>, qw{} are handled here; lax, but who gives | |
8b887207 | 16 | + \s+ q[wq]? \s* [\[({<] \s* ( [\w:]+? (?: \s+[\w:]+? )*? ) \s* [\])}>] |
04ff144d | 17 | + ) |
18 | + \s* ; | |
19 | + /x | |
20 | + ) | |
21 | + { | |
cc68fcc8 | 22 | + my @deps = ( $1 ? split /\s+/, $2 : $3 ? $4 : split /\s+/, $5 ); |
04ff144d | 23 | + for my $mod ( grep !exists $require{$_}, @deps ) { |
24 | + $require{$mod} = ''; | |
25 | + $line{$mod} = $_; | |
26 | + } | |
27 | + } | |
28 | + | |
29 | + elsif ( | |
30 | ||
31 | # ouch could be in a eval, perhaps we do not want these since we catch | |
32 | # an exception they must not be required |