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

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2014-01-21 16:09:49 -0600 (Tue, 21 Jan 2014)
New Revision: 7484

Modified:
   branches/release-0.95/bin/swiftrun
Log:
jobwalltime fix
Allow undocumented providerattributes


Modified: branches/release-0.95/bin/swiftrun
===================================================================
--- branches/release-0.95/bin/swiftrun	2014-01-20 16:48:08 UTC (rev 7483)
+++ branches/release-0.95/bin/swiftrun	2014-01-21 22:09:49 UTC (rev 7484)
@@ -46,6 +46,7 @@
                    'maxnodesperjob'            => 'globus.maxNodes',
                    'maxsubmitrate'             => 'karajan.maxSubmitRate',
                    'overallocationdecayfactor' => 'globus.overallocationDecayFactor',
+                   'providerattributes'        => 'globus.providerAttributes',
                    'remotemonitorenabled'      => 'globus.remoteMonitorEnabled',
                    'slurm'                     => 'globus.slurm',
                    'taskdir'                   => 'globus.scratch',
@@ -121,7 +122,7 @@
 
    if( $property eq "jobwalltime" ) {
       verify_in_hhmmss($key, $value);
-      $property = hhmmss_to_seconds($value); 
+      $value = hhmmss_to_seconds($value); 
    } 
 
    elsif ( $property eq "taskthrottle" ) {
@@ -172,7 +173,7 @@
    elsif ( $property eq "workdir" )       { return "<workdirectory>$value</workdirectory>\n"; }
    elsif ( $property eq "taskdir" )       { return "<scratch>$value</scratch>\n"; }
    elsif ( $property eq "filesystem" )    { return "<filesystem provider=\"" . $value . "\"/>\n"; }
-   
+
    my ( $xmlnamespace, $xmlproperty ) = split(/\./, $site_aliases{ $propertyStart });
    if ( defined($xmlnamespace) && defined($xmlproperty)) {
       return "<profile namespace=\"" . $xmlnamespace . "\" key=\"" . $xmlproperty . "\">" . $value . "</profile>\n";