[whimsy] branch master updated: Must exist in order to use ftype

[sebb]

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 24a7a8fd Must exist in order to use ftype
24a7a8fd is described below

commit 24a7a8fdee17d506f0318569aef08c473edd186a
Author: Sebb <s...@apache.org>
AuthorDate: Tue May 3 15:39:05 2022 +0100

    Must exist in order to use ftype
---
 tools/merge_subscriptions.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/merge_subscriptions.rb b/tools/merge_subscriptions.rb
index 1f58d527..0299d5bb 100644
--- a/tools/merge_subscriptions.rb
+++ b/tools/merge_subscriptions.rb
@@ -95,7 +95,7 @@ def merge_files(old_host, new_host, out)
       targ = path.sub(old_host, out)
       # 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'
+      unless File.exist?(targ) && File.ftype(targ) == 'link'
         dir = File.dirname(targ)
         unless File.directory? dir
           # puts "Making #{dir}"