[Swift-commit] r3557 - usertools/swift/swiftconfig/bin

[noreply at svn.ci.uchicago.edu]

Author: davidk
Date: 2010-08-20 02:11:57 -0500 (Fri, 20 Aug 2010)
New Revision: 3557

Modified:
   usertools/swift/swiftconfig/bin/swiftconfig
   usertools/swift/swiftconfig/bin/swiftrun
Log:
Fixed bug with -edit incorrectly creating directories


Modified: usertools/swift/swiftconfig/bin/swiftconfig
===================================================================
--- usertools/swift/swiftconfig/bin/swiftconfig	2010-08-19 03:46:23 UTC (rev 3556)
+++ usertools/swift/swiftconfig/bin/swiftconfig	2010-08-20 07:11:57 UTC (rev 3557)
@@ -119,13 +119,13 @@
 # Modify a site entry
 if ($option_edit) {
     my $output_directory = "$dotswift_directory/sites/$option_edit";
-    create_directory($output_directory);
 
     my $sites_file = "$output_directory/sites.xml";
     if ( !-e "$sites_file" ) {
         die "Unable to find configuration for $option_edit\n";
     }
-    
+
+    create_directory($output_directory);    
     my $xml_filename = "$output_directory/sites.xml";
     my $xml_ref = $xml->XMLin(
         $xml_filename,

Modified: usertools/swift/swiftconfig/bin/swiftrun
===================================================================
--- usertools/swift/swiftconfig/bin/swiftrun	2010-08-19 03:46:23 UTC (rev 3556)
+++ usertools/swift/swiftconfig/bin/swiftrun	2010-08-20 07:11:57 UTC (rev 3557)
@@ -180,9 +180,6 @@
 if(-e "$run_directory/swift.properties") {
     $system_command .= "-config $run_directory/swift.properties ";
 }
-else {
-    print "No such file $run_directory/swift.properties\n";
-}
 
 # Add unknown options
 foreach my $unknown_argument (@ARGV) {