[LON-CAPA-cvs] cvs: loncom(version_2_10_X) /auth lonroles.pm

[raeburn]

raeburn		Tue Aug 17 21:35:40 2010 EDT

  Modified files:              (Branch: version_2_10_X)
    /loncom/auth	lonroles.pm 
  Log:
  - Backport 1.257.
  
  
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.256.2.1 loncom/auth/lonroles.pm:1.256.2.2
--- loncom/auth/lonroles.pm:1.256.2.1	Thu Aug 12 23:40:49 2010
+++ loncom/auth/lonroles.pm	Tue Aug 17 21:35:40 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.256.2.1 2010/08/12 23:40:49 raeburn Exp $
+# $Id: lonroles.pm,v 1.256.2.2 2010/08/17 21:35:40 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1582,7 +1582,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 '') || 
@@ -1591,7 +1591,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'};