Merge branch 'fix-rake-check-hooks' into 'master'

Check that hooks directory exists before attempting to call realpath This MR checks that the hooks directories actually exist before attempting to resolve their `realpath`. Users who attempted to restore from source to an omnibus installation would get ugly errors when running `gitlab-rake gitlab:check`: ``` Errno::ENOENT: No such file or directory @ realpath_rec - /var/opt/gitlab/git-data/repositories/Wanda/www.git/hooks /opt/gitlab/embedded/service/gitlab-rails/lib/tasks/gitlab/check.rake:488:in `realpath' /opt/gitlab/embedded/service/gitlab-rails/lib/tasks/gitlab/check.rake:488:in `block in check_repos_hooks_directory_is_link' /opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/activerecord-4.1.11/lib/active_record/relation/batches.rb:52:in `block (2 levels) in find_each' /opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/activerecord-4.1.11/lib/active_record/relation/batches.rb:52:in `each' /opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/activerecord-4.1.11/lib/active_record/relation/batches.rb:52:in `block in find_each' /opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/activerecord-4.1.11/lib/active_record/relation/batches.rb:126:in `find_in_batches' /opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/activerecord-4.1.11/lib/active_record/relation/batches.rb:51:in `find_each' /opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/activerecord-4.1.11/lib/active_record/querying.rb:9:in `find_each' /opt/gitlab/embedded/service/gitlab-rails/lib/tasks/gitlab/check.rake:482:in `check_repos_hooks_directory_is_link' /opt/gitlab/embedded/service/gitlab-rails/lib/tasks/gitlab/check.rake:343:in `block (3 levels) in <top (required)>' Tasks: TOP => gitlab:check => gitlab:gitlab_shell:check ``` Closes #2121 #2082 See merge request !1068

Merge branch 'fix-rake-check-hooks' into 'master'
c13e2290 · Jacob Vosmaer · 1e4b3264 · ee171028 · c13e2290
Commit c13e2290 authored Jul 30, 2015 by Jacob Vosmaer
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

check.rake lib/tasks/gitlab/check.rake +4 -4

No files found.
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -485,7 +485,8 @@ namespace :gitlab do

        if project.empty_repo?
          puts "repository is empty".magenta
-        elsif File.realpath(project_hook_directory) == File.realpath(gitlab_shell_hooks_path)
+        elsif File.directory?(project_hook_directory) && File.directory?(gitlab_shell_hooks_path) &&
+            (File.realpath(project_hook_directory) == File.realpath(gitlab_shell_hooks_path))
          puts 'ok'.green
        else
          puts "wrong or missing hooks".red
@@ -754,7 +755,7 @@ namespace :gitlab do
    print "Ruby version >= #{required_version} ? ... "

    if current_version.valid? && required_version <= current_version
-        puts "yes (#{current_version})".green
+      puts "yes (#{current_version})".green
    else
      puts "no".red
      try_fixing_it(
@@ -772,7 +773,7 @@ namespace :gitlab do
    print "Git version >= #{required_version} ? ... "

    if current_version.valid? && required_version <= current_version
-        puts "yes (#{current_version})".green
+      puts "yes (#{current_version})".green
    else
      puts "no".red
      try_fixing_it(
@@ -806,4 +807,3 @@ namespace :gitlab do
    end
  end
 end
-