Download as
Browse Code »

Commit c18564d2cbbffa5d15d2ead97ba0fc4623f77e07

Authored by Sato Hiroyuki
1 parent e7bcbb95
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fix abort gitlab:app:check 

When the file that pointed git bin_path in gitlab.yml dose'nt exist,
bundle rake gitlab:app:check would be aborted.

refs #4205
Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
lib/gitlab/version_info.rb
  Diff comments   View file @c18564d
@@ -5,7 +5,7 @@ module Gitlab @@ -5,7 +5,7 @@ module Gitlab
5 attr_reader :major, :minor, :patch 5 attr_reader :major, :minor, :patch
6 6
7 def self.parse(str) 7 def self.parse(str)
8 - if m = str.match(/(\d+)\.(\d+)\.(\d+)/) 8 + if str && m = str.match(/(\d+)\.(\d+)\.(\d+)/)
9 VersionInfo.new(m[1].to_i, m[2].to_i, m[3].to_i) 9 VersionInfo.new(m[1].to_i, m[2].to_i, m[3].to_i)
10 else 10 else
11 VersionInfo.new 11 VersionInfo.new
lib/tasks/gitlab/check.rake
  Diff comments   View file @c18564d
@@ -659,7 +659,7 @@ namespace :gitlab do @@ -659,7 +659,7 @@ namespace :gitlab do
659 current_version = Gitlab::VersionInfo.parse(gitlab_shell_version) 659 current_version = Gitlab::VersionInfo.parse(gitlab_shell_version)
660 660
661 print "GitLab Shell version >= #{required_version} ? ... " 661 print "GitLab Shell version >= #{required_version} ? ... "
662 - if required_version <= current_version 662 + if current_version.valid? && required_version <= current_version
663 puts "OK (#{current_version})".green 663 puts "OK (#{current_version})".green
664 else 664 else
665 puts "FAIL. Please update gitlab-shell to #{required_version} from #{current_version}".red 665 puts "FAIL. Please update gitlab-shell to #{required_version} from #{current_version}".red
@@ -673,7 +673,7 @@ namespace :gitlab do @@ -673,7 +673,7 @@ namespace :gitlab do
673 puts "Your git bin path is \"#{Gitlab.config.git.bin_path}\"" 673 puts "Your git bin path is \"#{Gitlab.config.git.bin_path}\""
674 print "Git version >= #{required_version} ? ... " 674 print "Git version >= #{required_version} ? ... "
675 675
676 - if required_version <= current_version 676 + if current_version.valid? && required_version <= current_version
677 puts "yes (#{current_version})".green 677 puts "yes (#{current_version})".green
678 else 678 else
679 puts "no".red 679 puts "no".red