RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Elan Ruusamäe
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 13-Apr-2008 01:24:41
Branch: rpm-4_5 Handle: 2008041223244100
Modified files: (Branch: rpm-4_5)
rpm/scripts perl.prov
Log:
- merge from 5.0
Summary:
Revision Changes Path
1.10.2.1 +10 -5 rpm/scripts/perl.prov
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/scripts/perl.prov
============================================================================
$ cvs diff -u -r1.10 -r1.10.2.1 perl.prov
--- rpm/scripts/perl.prov 25 May 2007 17:36:39 -0000 1.10
+++ rpm/scripts/perl.prov 12 Apr 2008 23:24:41 -0000 1.10.2.1
@@ -130,7 +130,11 @@
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});
}
}
@@ -140,15 +144,16 @@
# here are examples of VERSION lines from the perl distribution
- #FindBin.pm:$VERSION = $VERSION = sprintf("%d.%02d", q$Revision: 1.10 $
=~ /(\d+)\.(\d+)/);
- #ExtUtils/Install.pm:$VERSION = substr q$Revision: 1.10 $, 10;
- #CGI/Apache.pm:$VERSION = (qw$Revision: 1.10 $)[1];
+ #FindBin.pm:$VERSION = $VERSION = sprintf("%d.%02d", q$Revision:
1.10.2.1 $ =~ /(\d+)\.(\d+)/);
+ #ExtUtils/Install.pm:$VERSION = substr q$Revision: 1.10.2.1 $, 10;
+ #CGI/Apache.pm:$VERSION = (qw$Revision: 1.10.2.1 $)[1];
#DynaLoader.pm:$VERSION = $VERSION = "1.03"; # avoid typo warning
+ #General.pm:$Config::General::VERSION = 2.33;
#
# or with the new "our" pragma you could (read will) see:
#
# our $VERSION = '1.00'
- if (($package) && (m/^\s*(our\s+)?\$VERSION\s*=\s+/)) {
+ if (($package) && (m/^\s*(our\s+)?\$(\Q$package\E::)?VERSION\s*=\s+/)) {
# first see if the version string contains the string
# '$Revision' this often causes bizzare strings and is the most
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
