Changeset 32123 for main/trunk/greenstone2/perllib/FileUtils.pm

Timestamp:

2018-02-08T14:34:56+13:00 (6 years ago)

Author:

kjdon

Message:

when hard linking, if the destination file already exists then remove it and continue with the hard link. Don't just walk away as we may be trying to link to a new file (as in the case of a source document changing in import).

File:

• main/trunk/greenstone2/perllib/FileUtils.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/FileUtils.pm

@@ -627 +627 @@
   ##    print STDERR "**** src = ", unicode::debug_unicode_string($src),"\n";
   # a few sanity checks
-  if (-e $dest)
-  {
-    # destination file already exists
-    return;
-  }
-  elsif (!-e $src)
+  if (!-e $src)
   {
     print STDERR "FileUtils::hardLink() source file \"" . $src . "\" does not exist\n";
@@ -641 +636 @@
     print STDERR "FileUtils::hardLink() source \"" . $src . "\" is a directory\n";
     return 1;
+  }
+  elsif (-e $dest)
+  {
+      print STDERR "FileUtils::hardlink() dest file ($dest) exists, removing it\n";
+      &removeFiles($dest);
   }