[LON-CAPA-cvs] cvs: loncom / lond /auth lonroles.pm

[raeburn]

raeburn		Tue Aug 17 20:06:31 2010 EDT

  Modified files:              
    /loncom	lond 
    /loncom/auth	lonroles.pm 
  Log:
  - Allow letters in Version name after major and minor version number 
    (e.g., 2.10.0.RC1).
  
  
Index: loncom/lond
diff -u loncom/lond:1.450 loncom/lond:1.451
--- loncom/lond:1.450	Mon Jul 26 21:52:10 2010
+++ loncom/lond	Tue Aug 17 20:06:25 2010
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.450 2010/07/26 21:52:10 raeburn Exp $
+# $Id: lond,v 1.451 2010/08/17 20:06:25 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -58,7 +58,7 @@
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.450 $'; #' stupid emacs
+my $VERSION='$Revision: 1.451 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid="default";
 my $currentdomainid;
@@ -3183,7 +3183,7 @@
                             $loncaparev = $Apache::lonnet::loncaparevs{$clientname};
                         }
                         my ($major,$minor);
-                        if ($loncaparev =~ /^\'?(\d+)\.(\d+)\.[\d.\-]+\'?/) {
+                        if ($loncaparev =~ /^\'?(\d+)\.(\d+)\.[\w.\-]+\'?/) {
                             $major = $1;
                             $minor = $2;
                         }
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.256 loncom/auth/lonroles.pm:1.257
--- loncom/auth/lonroles.pm:1.256	Sun Aug  1 18:34:19 2010
+++ loncom/auth/lonroles.pm	Tue Aug 17 20:06:30 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.256 2010/08/01 18:34:19 raeburn Exp $
+# $Id: lonroles.pm,v 1.257 2010/08/17 20:06:30 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1564,7 +1564,7 @@
     my ($switchserver,$warning);
     if ($required ne '') {
         my ($reqdmajor,$reqdminor) = ($required =~ /^(\d+)\.(\d+)$/);
-        my ($major,$minor) = ($loncaparev =~ /^\'?(\d+)\.(\d+)\.[\d.\-]+\'?$/);
+        my ($major,$minor) = ($loncaparev =~ /^\'?(\d+)\.(\d+)\.[\w.\-]+\'?$/);
         if ($reqdmajor ne '' && $reqdminor ne '') {
             my $otherserver;
             if (($major eq '' && $minor eq '') || 
@@ -1573,7 +1573,7 @@
                 my $switchlcrev = 
                     &Apache::lonnet::get_server_loncaparev($env{'user.domain'},
                                                            $userdomserver);
-                my ($swmajor,$swminor) = ($switchlcrev =~ /^\'?(\d+)\.(\d+)\.[\d.\-]+\'?$/);
+                my ($swmajor,$swminor) = ($switchlcrev =~ /^\'?(\d+)\.(\d+)\.[\w.\-]+\'?$/);
                 if (($swmajor eq '' && $swminor eq '') || ($reqdmajor > $swmajor) || 
                     (($reqdmajor == $swmajor) && ($reqdminor > $swminor))) {
                     my $cdom = $env{'course.'.$tcourseid.'.domain'};