[Swift-commit] r7426 - branches/release-0.95/bin

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2013-12-13 14:50:37 -0600 (Fri, 13 Dec 2013)
New Revision: 7426

Modified:
   branches/release-0.95/bin/swiftrun
Log:
Make sure all property keys are converted to lower case


Modified: branches/release-0.95/bin/swiftrun
===================================================================
--- branches/release-0.95/bin/swiftrun	2013-12-13 18:04:40 UTC (rev 7425)
+++ branches/release-0.95/bin/swiftrun	2013-12-13 20:50:37 UTC (rev 7426)
@@ -126,8 +126,7 @@
 
    # In the case of a shortened definition, check for aliases 
    if ( !defined( $property ) ) {
-      if ( defined( $xml_aliases{ lc( $namespace )})) { 
-         $namespace=lc($namespace);
+      if ( defined( $xml_aliases{ $namespace })) { 
 
          # Values that need that may need modifications
          if( $namespace eq "jobwalltime" ) {
@@ -405,6 +404,7 @@
             $_ =~ s/^\s+//;               
             if( /^}/ ) { last; } 
             my ($key, $value) = split('=', ($prefix . ".$_"), 2);
+            $key = lc($key);
             if($key eq "sites") { $key = "site"; }
             $value =~ s/\$(\w+)/$ENV{$1}/g;
             $properties{ $key } = $value;
@@ -413,6 +413,7 @@
 
       else {
          my ($key, $value) = split('=', $_, 2);
+         $key = lc($key);
          if($key eq "sites") { $key = "site"; }
          if(defined($key) && defined($value) && length($key) && length($value)) {
             $value =~ s/\$(\w+)/$ENV{$1}/g; # Substitute environment variables