diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2010-09-28 12:25:27 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2010-09-28 12:25:27 +0000 |
| commit | 61caaee0289ea73c1b479d7d6bb693f84edd69c7 (patch) | |
| tree | c68bdcafb7a1cf9a40673823878060cef3b4013c | |
| parent | 4823863b74461c5dcb42c7b322631a37d7659154 (diff) | |
Undo last change now that RCS keyword expansion is disabled on the perl sources
| -rwxr-xr-x | gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/parse_version.t | 6 | ||||
| -rwxr-xr-x | gnu/usr.bin/perl/cpan/Module-Build/t/metadata.t | 4 | ||||
| -rwxr-xr-x | gnu/usr.bin/perl/cpan/Module-Build/t/moduleinfo.t | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/parse_version.t b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/parse_version.t index da5d9511c1f..858e2941813 100755 --- a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/parse_version.t +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/parse_version.t @@ -12,7 +12,7 @@ my $Has_Version = eval 'require version; "version"->import; 1'; my %versions = (q[$VERSION = '1.00'] => '1.00', q[*VERSION = \'1.01'] => '1.01', - q[($VERSION) = q/Revision: 32208 / =~ /(\d+)/g;] => 32208, + q[($VERSION) = q$Revision: 32208 $ =~ /(\d+)/g;] => 32208, q[$FOO::VERSION = '1.10';] => '1.10', q[*FOO::VERSION = \'1.11';] => '1.11', '$VERSION = 0.02' => 0.02, @@ -34,8 +34,8 @@ my %versions = (q[$VERSION = '1.00'] => '1.00', qq[\$Something::VERSION == 1.0\n\$VERSION = 2.3\n] => '2.3', qq[\$Something::VERSION == 1.0\n\$VERSION = 2.3\n\$VERSION = 4.5\n] => '2.3', - '$VERSION = sprintf("%d.%03d", q/Revision: 3.74 / =~ /(\d+)\.(\d+)/);' => '3.074', - '$VERSION = substr(q/Revision: 2.8 /, 10) + 2 . "";' => '4.8', + '$VERSION = sprintf("%d.%03d", q$Revision: 3.74 $ =~ /(\d+)\.(\d+)/);' => '3.074', + '$VERSION = substr(q$Revision: 2.8 $, 10) + 2 . "";' => '4.8', ); diff --git a/gnu/usr.bin/perl/cpan/Module-Build/t/metadata.t b/gnu/usr.bin/perl/cpan/Module-Build/t/metadata.t index 81966c4f651..1ac35b28c47 100755 --- a/gnu/usr.bin/perl/cpan/Module-Build/t/metadata.t +++ b/gnu/usr.bin/perl/cpan/Module-Build/t/metadata.t @@ -171,9 +171,9 @@ is_deeply($mb->find_dist_packages, { $dist->change_file( 'lib/Simple.pm', <<'---' ); package Simple; -$VERSION = version->new('0.60.' . (qw/Revision: 128 /)[1]); +$VERSION = version->new('0.60.' . (qw$Revision: 128 $)[1]); package Simple::Simon; -$VERSION = version->new('0.61.' . (qw/Revision: 129 /)[1]); +$VERSION = version->new('0.61.' . (qw$Revision: 129 $)[1]); --- $dist->regen; my $provides = new_build()->get_metadata()->{provides}; diff --git a/gnu/usr.bin/perl/cpan/Module-Build/t/moduleinfo.t b/gnu/usr.bin/perl/cpan/Module-Build/t/moduleinfo.t index 9c10448624c..e28726d493a 100755 --- a/gnu/usr.bin/perl/cpan/Module-Build/t/moduleinfo.t +++ b/gnu/usr.bin/perl/cpan/Module-Build/t/moduleinfo.t @@ -424,9 +424,9 @@ __DATA__ # Make sure we handle version.pm $VERSIONs well $dist->change_file( 'lib/Simple.pm', <<'---' ); package Simple; -$VERSION = version->new('0.60.' . (qw/Revision: 128 /)[1]); +$VERSION = version->new('0.60.' . (qw$Revision: 128 $)[1]); package Simple::Simon; -$VERSION = version->new('0.61.' . (qw/Revision: 129 /)[1]); +$VERSION = version->new('0.61.' . (qw$Revision: 129 $)[1]); --- $dist->regen; |