diff options
| author | Ville Skyttä <ville.skytta@iki.fi> | 2010-02-13 12:02:20 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2010-02-15 08:49:15 +0200 |
| commit | c2b1b54500bdbd1c252da210a05d989b877cb9c6 (patch) | |
| tree | e3d7e49036c6c93f8b040f9c01804835c6db17a4 /scripts | |
| parent | a50c3e9d69868f6d8200044f26f01653b57ff5f5 (diff) | |
| download | librpm-tizen-c2b1b54500bdbd1c252da210a05d989b877cb9c6.tar.gz librpm-tizen-c2b1b54500bdbd1c252da210a05d989b877cb9c6.tar.bz2 librpm-tizen-c2b1b54500bdbd1c252da210a05d989b877cb9c6.zip | |
Don't trump versioned module dependencies with unversioned ones.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/perl.req | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/perl.req b/scripts/perl.req index d010ce319..07eed6bdc 100755 --- a/scripts/perl.req +++ b/scripts/perl.req @@ -244,18 +244,18 @@ sub process_file { # use base qw(Foo) dependencies if ($statement eq "use" && $module eq "base") { - $require{$module} = undef; + $require{$module} ||= undef; if ($version =~ /^qw\s*[(\/]\s*([^)\/]+?)\s*[)\/]/) { - $require{$_} = undef for split(' ', $1); + $require{$_} ||= undef for split(' ', $1); } elsif ($version =~ /(["'])([^"']+)\1/) { - $require{$2} = undef; + $require{$2} ||= undef; } next; } $version = undef unless $version =~ /^$modver_re$/o; - $require{$module} = $version; + $require{$module} ||= $version; } } |