[Swift-commit] r7374 - trunk/bin

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2013-12-04 12:03:34 -0600 (Wed, 04 Dec 2013)
New Revision: 7374

Modified:
   trunk/bin/swiftrun
Log:
Allow the provider passthru properties


Modified: trunk/bin/swiftrun
===================================================================
--- trunk/bin/swiftrun	2013-12-04 17:59:01 UTC (rev 7373)
+++ trunk/bin/swiftrun	2013-12-04 18:03:34 UTC (rev 7374)
@@ -76,8 +76,16 @@
 sub property_to_xml {
    my $key = $_[0];
    my $value = $_[1];
+
    my ( $site, $sitename, $namespace, $property ) = split(/\./, $key);
 
+   # Allow exceptions for swift properties with dot separators (ie key=slurm.properties)
+   if ( defined($property) && $namespace =~ m/^slurm|^condor/ ) { 
+      ( $site, $sitename, $namespace, $property ) = split(/\./, $key);
+      $property = "$namespace.$property";
+      $namespace = "globus";
+   }
+
    # In the case of a shortened definition, check for aliases 
    if ( !defined( $property ) ) {
       if ( defined( $xml_aliases{ lc( $namespace )})) {