Changeset 35412 for branches/eam_branches/ipp-20130307/pstamp/scripts/pstamp_cleanup.pl

Timestamp:

Apr 19, 2013, 3:39:39 PM (13 years ago)

Author:

eugene

Message:

merged from trunk

Location:

branches/eam_branches/ipp-20130307/pstamp/scripts

Files:

• . (modified) (1 prop)
• pstamp_cleanup.pl (modified) (1 diff)

branches/eam_branches/ipp-20130307/pstamp/scripts/pstamp_cleanup.pl

@@ -183 +183 @@
     }
 
-    my $command = "rm -r $dir";
+    # do an ls of the directory before starting
+#    print "directory listing for $dir\n";
+#    system "ls $dir";
+
+    my $command = "rm -rf $dir";
     unless ($no_update) {
         my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
             run(command => $command, verbose => $verbose);
         unless ($success) {
-            my $rc = $error_code >> 8;
-            my_die("Unable to perform $command return status: $rc", $req_id, $rc);
+            if (-e $dir) {
+                my $rc = $error_code >> 8;
+                my_die("Unable to perform $command return status: $rc", $req_id, $rc);
+            } else {
+                print STDERR "rm claimed to fail but directory no longer exists\n";
+            }
         }
     } else {