[Swift-commit] r7353 - in branches/release-0.95: bin libexec

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2013-12-02 12:09:40 -0600 (Mon, 02 Dec 2013)
New Revision: 7353

Modified:
   branches/release-0.95/bin/swiftrun
   branches/release-0.95/libexec/release.txt
Log:
Updated release number
Allow configs with dotted key values


Modified: branches/release-0.95/bin/swiftrun
===================================================================
--- branches/release-0.95/bin/swiftrun	2013-12-02 17:58:12 UTC (rev 7352)
+++ branches/release-0.95/bin/swiftrun	2013-12-02 18:09:40 UTC (rev 7353)
@@ -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 )})) { 

Modified: branches/release-0.95/libexec/release.txt
===================================================================
--- branches/release-0.95/libexec/release.txt	2013-12-02 17:58:12 UTC (rev 7352)
+++ branches/release-0.95/libexec/release.txt	2013-12-02 18:09:40 UTC (rev 7353)
@@ -1 +1 @@
-trunk
+0.95 RC1