[Swift-commit] r7465 - trunk/bin

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2014-01-09 12:38:03 -0600 (Thu, 09 Jan 2014)
New Revision: 7465

Modified:
   trunk/bin/swiftrun
Log:
Applying some fixes from 0.95


Modified: trunk/bin/swiftrun
===================================================================
--- trunk/bin/swiftrun	2014-01-09 17:44:17 UTC (rev 7464)
+++ trunk/bin/swiftrun	2014-01-09 18:38:03 UTC (rev 7465)
@@ -166,11 +166,9 @@
    elsif ( $property eq "taskdir" )       { return "<scratch>$value</scratch>\n"; }
    elsif ( $property eq "filesystem" )    { return "<filesystem provider=\"" . $value . "\"/>\n"; }
    
-   else { 
-      my ( $xmlnamespace, $xmlproperty ) = split(/\./, $site_aliases{ $propertyStart });
-      if ( defined($xmlnamespace) && defined($xmlproperty)) {
-         return "<profile namespace=\"" . $xmlnamespace . "\" key=\"" . $xmlproperty . "\">" . $value . "</profile>\n"; 
-      }
+   my ( $xmlnamespace, $xmlproperty ) = split(/\./, $site_aliases{ $propertyStart });
+   if ( defined($xmlnamespace) && defined($xmlproperty)) {
+      return "<profile namespace=\"" . $xmlnamespace . "\" key=\"" . $xmlproperty . "\">" . $value . "</profile>\n"; 
    }
 } 
 
@@ -364,7 +362,7 @@
 
 # Create/increment run directory
 my $run_number = 0;
-my @run_directories = <run???>;
+my @run_directories = <run[0-9][0-9][0-9]>;
 
 if(@run_directories) {
    $run_number = $run_directories[-1];