diff options
author | Thierry Vignaud <tv@mageia.org> | 2012-07-25 17:02:05 +0000 |
---|---|---|
committer | Thierry Vignaud <tv@mageia.org> | 2012-07-25 17:02:05 +0000 |
commit | 5fb6b8fee487f9b017f13d8589745ca668eaedab (patch) | |
tree | b1960b42a7f60ed4c4b3fa27ea4e01e92e24dc36 /perl.prov | |
parent | 594dc8fa866d31cd1325ac7aba6c56b6f8967e6f (diff) | |
download | rpm-setup-5fb6b8fee487f9b017f13d8589745ca668eaedab.tar rpm-setup-5fb6b8fee487f9b017f13d8589745ca668eaedab.tar.gz rpm-setup-5fb6b8fee487f9b017f13d8589745ca668eaedab.tar.bz2 rpm-setup-5fb6b8fee487f9b017f13d8589745ca668eaedab.tar.xz rpm-setup-5fb6b8fee487f9b017f13d8589745ca668eaedab.zip |
sync with upstream rpm.org:
"Fix perl version provide for packages defined in multiple blocks (#rhbz214496)
Successive definitions of the same package shouldn't stomp on previously
found $VERSION, this is how perl itself behaves.
Patch from James Ralston."
(Panu Matilainen, 2007-08-28)
Diffstat (limited to 'perl.prov')
-rwxr-xr-x | perl.prov | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -139,7 +139,11 @@ sub process_file { if ($package eq 'main') { undef $package; } else { - $require{$package}=undef; + # If $package already exists in the $require hash, it means + # the package definition is broken up over multiple blocks. + # In that case, don't stomp a previous $VERSION we might have + # found. (See BZ#214496.) + $require{$package} = undef unless (exists $require{$package}); } } } |