]>
Commit | Line | Data |
---|---|---|
de6920d5 | 1 | --- rpm-5.1.4/scripts/perl.req 2008-08-20 21:27:09.929116479 +0200 |
2 | +++ rpm-5.1.4/scripts/perl.req 2008-10-26 10:48:31.529709016 +0100 | |
3 | @@ -196,7 +196,28 @@ | |
4 | } | |
5 | } | |
6 | ||
7 | - if ( | |
8 | + # handle "use base qw/ foo::bar baz::blah /;" and variations | |
9 | + if ( | |
10 | + m/^ \s* use \s+ base | |
11 | + (?: \s+ q[wq]? \s* ( [!@#\$%^&*'"\/+=`~,.?-] ) \s* ( [\w:]+? (?: \s+[\w:]+? )*? ) \s* \1 | |
12 | + | | |
13 | + \s* ( ["'] ) ( [\w:]+? ) \3 | |
14 | + | | |
15 | + # qw[], qw(), qw<>, qw{} are handled here; lax, but who gives | |
16 | + \s+ q[wq]? \s* [\[({<] \s* ( [\w:]+? (?: \s+[\w:]+? )*? ) \s* [\])}>] | |
17 | + ) | |
18 | + \s* ; | |
19 | + /x | |
20 | + ) | |
21 | + { | |
22 | + my @deps = ( $1 ? split /\s+/, $2 : $3 ? $4 : split /\s+/, $5 ); | |
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 |