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

[noreply at svn.ci.uchicago.edu]

Author: davidk
Date: 2010-07-20 02:51:34 -0500 (Tue, 20 Jul 2010)
New Revision: 3449

Modified:
   usertools/swift/swiftconfig/bin/swiftconfig
   usertools/swift/swiftconfig/bin/swiftrun
Log:
Switch from File::Path remove_tree to legacy rmtree to ensure it runs on sites with older perl installations (eg. bridled and login)


Modified: usertools/swift/swiftconfig/bin/swiftconfig
===================================================================
--- usertools/swift/swiftconfig/bin/swiftconfig	2010-07-20 07:36:24 UTC (rev 3448)
+++ usertools/swift/swiftconfig/bin/swiftconfig	2010-07-20 07:51:34 UTC (rev 3449)
@@ -3,7 +3,7 @@
 use Cwd;
 use Cwd qw(abs_path);
 use File::Copy;
-use File::Path qw(remove_tree);
+use File::Path;
 
 my $swifthome = '';
 if ( $ENV{'SWIFT_HOME'} && -e "$ENV{'SWIFT_HOME'}/bin/swift" ) {
@@ -293,7 +293,7 @@
           "Unable to find site entry for $remove\n";
       }
 
-      remove_tree("$dotswift/sites/$remove") || die "Unable to remove directory $dotswift/sites/$remove\n";
+      rmtree("$dotswift/sites/$remove") || die "Unable to remove directory $dotswift/sites/$remove\n";
 }
 
 # List all available templates

Modified: usertools/swift/swiftconfig/bin/swiftrun
===================================================================
--- usertools/swift/swiftconfig/bin/swiftrun	2010-07-20 07:36:24 UTC (rev 3448)
+++ usertools/swift/swiftconfig/bin/swiftrun	2010-07-20 07:51:34 UTC (rev 3449)
@@ -3,7 +3,7 @@
 use Cwd;
 use Cwd qw(abs_path);
 use File::Copy;
-use File::Path qw(remove_tree);
+use File::Path;
 
 my $swifthome = '';
 if ( $ENV{'SWIFT_HOME'} && -e "$ENV{'SWIFT_HOME'}/bin/swift" ) {
@@ -107,11 +107,6 @@
         }
 }
 
-# Rename auths.default back to original
-if(-e "$ENV{'HOME'}/.ssh/auth.defaults.$datestring") {
-    move("$ENV{'HOME'}/.ssh/auth.defaults.$datestring", "$ENV{'HOME'}/.ssh/auth.defaults") || die "Unable to rename $ENV{'HOME'}/.ssh/auth.defaults.$datestring";
-}
-
 # Update XML tags
 open(SITEFILE, "$dotswift/jobs/$script_filename/$datestring/sites.xml") || die "Unable to open $dotswift/jobs/$script_filename/$datestring/sites.xml\n";
 my @sitedata = <SITEFILE>;
@@ -125,3 +120,8 @@
 print "Submitting job. Check $dotswift/jobs/$script_filename/$datestring for details\n";
 system("swift -sites.file $dotswift/jobs/$script_filename/$datestring/sites.xml -tc.file $dotswift/jobs/$script_filename/$datestring/tc.data $script");
 
+# Rename auths.default back to original
+if(-e "$ENV{'HOME'}/.ssh/auth.defaults.$datestring") {
+    move("$ENV{'HOME'}/.ssh/auth.defaults.$datestring", "$ENV{'HOME'}/.ssh/auth.defaults") || die "Unable to rename $ENV{'HOME'}/.ssh/auth.defaults.$datestring";
+}
+