From a10d47232778e093f7810d8011f887e5453f9007 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Wed, 12 Aug 2015 14:59:13 +0200 Subject: Handle broken symlinks in create-hooks If a repository contained a broken symlink named 'hooks', this would raise ENOENT in lib/gitlab_projects.rb, which got ignored in bin/create-hooks. This commit fixes that by making sure we handle broken symlinks in lib/gitlab_projects.rb. --- lib/gitlab_projects.rb | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/gitlab_projects.rb b/lib/gitlab_projects.rb index 11f3820..8bf000d 100644 --- a/lib/gitlab_projects.rb +++ b/lib/gitlab_projects.rb @@ -21,11 +21,19 @@ class GitlabProjects def self.create_hooks(path) local_hooks_directory = File.join(path, 'hooks') + real_local_hooks_directory = :not_found + begin + real_local_hooks_directory = File.realpath(local_hooks_directory) + rescue Errno::ENOENT + # real_local_hooks_directory == :not_found + end - if File.realpath(local_hooks_directory) != File.realpath(GLOBAL_HOOKS_DIRECTORY) - $logger.info "Moving existing hooks directory and symlinking global hooks directory for #{path}." - FileUtils.mv(local_hooks_directory, "#{local_hooks_directory}.old.#{Time.now.to_i}") - FileUtils.ln_s(GLOBAL_HOOKS_DIRECTORY, local_hooks_directory) + if real_local_hooks_directory != File.realpath(GLOBAL_HOOKS_DIRECTORY) + if File.exist?(local_hooks_directory) + $logger.info "Moving existing hooks directory and symlinking global hooks directory for #{path}." + FileUtils.mv(local_hooks_directory, "#{local_hooks_directory}.old.#{Time.now.to_i}") + end + FileUtils.ln_sf(GLOBAL_HOOKS_DIRECTORY, local_hooks_directory) else $logger.info "Hooks already exist for #{path}." true -- cgit v1.2.1