Fix overwrite check

diff --git a/cluster-copy/CHANGELOG b/cluster-copy/CHANGELOG
index 9ab5f55..a666e8e 100644 (file)
--- a/cluster-copy/CHANGELOG
+++ b/cluster-copy/CHANGELOG
@@ -13,3 +13,5 @@ Made the backup email contents translatable.
 Added checkboxes and a button for deleting multiple cluster copies at once.
 ---- Changes since 1.430 ----
 Added a Module Config setting to control the default sort order.
+---- Changes since 1.470 ----
+Fixed check to prevent over-writing a file when copying to this host.

diff --git a/cluster-copy/cluster-copy-lib.pl b/cluster-copy/cluster-copy-lib.pl
index fddeece..21a3040 100755 (executable)
--- a/cluster-copy/cluster-copy-lib.pl
+++ b/cluster-copy/cluster-copy-lib.pl
@@ -185,7 +185,8 @@ foreach $s (@run) {
                                push(@errs, [ $f, "Source file not found" ]);
                                next;
                                }
-                       if ($f eq $dest && $s->{'id'} == 0) {
+                       if (&simplify_path($f) eq &simplify_path($dest) &&
+                           $s->{'id'} == 0) {
                                push(@errs, [ $f, "Cannot overwrite same file on this server" ]);
                                next;
                                }

diff --git a/cluster-copy/lang/en b/cluster-copy/lang/en
index 53b5f48..8f02ae1 100644 (file)
--- a/cluster-copy/lang/en
+++ b/cluster-copy/lang/en
@@ -1,4 +1,4 @@
-index_title=Cluster Copies
+index_title=Cluster Copy Files
 index_add=Create a new scheduled file copy.
 index_none=No scheduled file copies have been defined.
 index_servers=Copy to servers