[LON-CAPA-cvs] cvs: loncom / loncron /lonnet/perl lonnet.pm

[raeburn]

raeburn		Tue Aug 17 22:22:05 2010 EDT

  Modified files:              
    /loncom	loncron 
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  - Allow letters in Version name after major and minor version number
    (e.g., 2.10.0.RC1).
  
  
Index: loncom/loncron
diff -u loncom/loncron:1.85 loncom/loncron:1.86
--- loncom/loncron:1.85	Tue Jul 20 02:42:27 2010
+++ loncom/loncron	Tue Aug 17 22:22:00 2010
@@ -2,7 +2,7 @@
 
 # Housekeeping program, started by cron, loncontrol and loncron.pl
 #
-# $Id: loncron,v 1.85 2010/07/20 02:42:27 raeburn Exp $
+# $Id: loncron,v 1.86 2010/08/17 22:22:00 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -691,7 +691,7 @@
         foreach my $id (sort(keys(%hostname))) {
             if ($id ne '') {
                 my $loncaparev = &Apache::lonnet::get_server_loncaparev('',$id,1,'loncron');
-                if ($loncaparev =~ /^[\d.\-]+$/) {
+                if ($loncaparev =~ /^[\w.\-]+$/) {
                     print $fh $id.':'.$loncaparev."\n";
                 }
             }
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.1080 loncom/lonnet/perl/lonnet.pm:1.1081
--- loncom/lonnet/perl/lonnet.pm:1.1080	Thu Jul 29 21:16:49 2010
+++ loncom/lonnet/perl/lonnet.pm	Tue Aug 17 22:22:05 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1080 2010/07/29 21:16:49 raeburn Exp $
+# $Id: lonnet.pm,v 1.1081 2010/08/17 22:22:05 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;
             }
         }