[LON-CAPA-cvs] cvs: loncom(version_2_10_X) /lonnet/perl lonnet.pm

[raeburn]

raeburn		Wed Aug 18 12:22:39 2010 EDT

  Modified files:              (Branch: version_2_10_X)
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  - Backport 1.1081.
  
  
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.1056.4.6 loncom/lonnet/perl/lonnet.pm:1.1056.4.7
--- loncom/lonnet/perl/lonnet.pm:1.1056.4.6	Tue Aug 17 01:49:04 2010
+++ loncom/lonnet/perl/lonnet.pm	Wed Aug 18 12:22:39 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1056.4.6 2010/08/17 01:49:04 raeburn Exp $
+# $Id: lonnet.pm,v 1.1056.4.7 2010/08/18 12:22:39 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -222,7 +222,7 @@
         my @ids=&current_machine_ids();
         if (grep(/^\Q$lonhost\E$/,@ids)) {
             $answer = $perlvar{'lonVersion'};
-            if ($answer =~ /^[\'\"]?([\d.\-]+)[\'\"]?$/) {
+            if ($answer =~ /^[\'\"]?([\w.\-]+)[\'\"]?$/) {
                 $loncaparev = $1;
             }
         } else {
@@ -238,14 +238,14 @@
                     my $response=$ua->request($request);
                     unless ($response->is_error()) {
                         my $content = $response->content;
-                        if ($content =~ /<p>VERSION\:\s*([\d.\-]+)<\/p>/) {
+                        if ($content =~ /<p>VERSION\:\s*([\w.\-]+)<\/p>/) {
                             $loncaparev = $1;
                         }
                     }
                 } else {
                     $loncaparev = $loncaparevs{$lonhost};
                 }
-            } elsif ($answer =~ /^[\'\"]?([\d.\-]+)[\'\"]?$/) {
+            } elsif ($answer =~ /^[\'\"]?([\w.\-]+)[\'\"]?$/) {
                 $loncaparev = $1;
             }
         }