Changeset 25598

Timestamp:

2012-05-14T18:45:15+12:00 (12 years ago)

Author:

ak19

Message:

When testing activate.pl with -keepold on Linux, it could not move the contents of the assoc subfolder of building and failed in the call to util::mv in util::mv_dir_contents. While the rename step was succeeding, the oriignal file remained in building, and Sam suspected the errors may be owing to the files being hardlinked. He suggested copying and deleting since renaming (and moving) these failed. Copying was no longer necessary, since the call rename() from mv() returned true for success. But deleting the file from building was necessary just as Sam said.

File:

• main/trunk/greenstone2/perllib/util.pm (modified) (3 diffs)

main/trunk/greenstone2/perllib/util.pm

@@ -174 +174 @@
         print STDERR "util::mv $file does not exist\n";
     } else {
-        rename ($file, $tempdest);
+        if(!rename ($file, $tempdest)) {
+        print STDERR "**** Failed to rename $file to $tempdest\n";
+        &File::Copy::copy($file, $tempdest);
+        &rm($file);
+        } 
+        elsif(-e $file) { # rename (partially) succeeded) but srcfile still exists after rename
+        #print STDERR "*** srcfile $file still exists after rename to $tempdest\n";
+        if(!-e $tempdest) {
+            print STDERR "@@@@ ERROR: $tempdest does not exist\n";
+        }
+        # Sometimes the rename operation fails (as does File::Copy::move).
+        # This turns out to be because the files are hardlinked. 
+        # Need to do a copy-delete in this case, however, the copy step is not necessary: 
+        # the srcfile got renamed into tempdest, but srcfile itself still exists, delete it.
+        #&File::Copy::copy($file, $tempdest);
+
+        &rm($file);     
+        }
     }
     }
@@ -215 +232 @@
                     } 
                 } else { # error
-                    print STDERR "ERROR. util::mv_dir_contents: subfolder $file still non-empty after moving contents to $dest_dir\n";
+                    print STDERR "ERROR. util::mv_dir_contents: subfolder $file still non-empty after moving contents to $dest_subdir\n";
                 }
             } else { # process files and any directories that don't already exist with a simple move
@@ -226 +243 @@
         &mk_dir($dest_dir);
     }
-    
-    #print STDERR "@@@@@ Copying files to: $dest_dir\n";
+
+    #print STDERR "@@@@@ Copying files |".join(",", @full_path_files)."| to: $dest_dir\n";
+
     if(@full_path_files) { # if non-empty, there's something to copy across
         &mv(@full_path_files, $dest_dir);