From c1c889af0ad4d609823788280767054074767d2d Mon Sep 17 00:00:00 2001 From: Jamie Cameron Date: Mon, 4 Aug 2008 23:27:20 +0000 Subject: [PATCH] Version semantics changed in perl 5.10 --- cpan/cpan-lib.pl | 13 +++++++++++++ cpan/index.cgi | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/cpan/cpan-lib.pl b/cpan/cpan-lib.pl index 48bfc56af..08bf4f0a0 100644 --- a/cpan/cpan-lib.pl +++ b/cpan/cpan-lib.pl @@ -386,5 +386,18 @@ if (&foreign_exists("mount")) { return 0; } +# get_nice_perl_version() +# Returns the Perl version is human-readable format +sub get_nice_perl_version +{ +local $ver = $^V; +if ($ver =~ /^v/) { + return $ver; + } +else { + return join(".", map { ord($_) } split(//, $^V)); + } +} + 1; diff --git a/cpan/index.cgi b/cpan/index.cgi index 08cbb7c9d..e7eeca8e9 100755 --- a/cpan/index.cgi +++ b/cpan/index.cgi @@ -3,7 +3,7 @@ # Display installed perl modules and a form for installing new ones require './cpan-lib.pl'; -$ver = join(".", map { ord($_) } split(//, $^V)); +$ver = &get_nice_perl_version(); &ui_print_header(undef, $text{'index_title'}, "", undef, 1, 1, 0, undef, undef, undef, &text('index_pversion', $ver)); &ReadParse();