[whimsy] branch master updated: Replace stale files

[se...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new 26e0cacc Replace stale files
26e0cacc is described below

commit 26e0cacc503e142e65fab27ace5790378fc3bbbc
Author: Sebb <se...@apache.org>
AuthorDate: Tue May 3 15:22:48 2022 +0100

    Replace stale files
---
 tools/merge_subscriptions.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/merge_subscriptions.rb b/tools/merge_subscriptions.rb
index ce1c1e65..1f58d527 100644
--- a/tools/merge_subscriptions.rb
+++ b/tools/merge_subscriptions.rb
@@ -93,7 +93,9 @@ def merge_files(old_host, new_host, out)
   Find.find(File.join(old_host, 'cache')) do |path|
     if File.file? path
       targ = path.sub(old_host, out)
-      unless File.exist? targ
+      # At the start of a merge, there may be plain files from before
+      # These need to be replaced with soft links
+      unless File.ftype(targ) == 'link'
         dir = File.dirname(targ)
         unless File.directory? dir
           # puts "Making #{dir}"