Skip to content
Snippets Groups Projects
Commit c18564d2 authored by Sato Hiroyuki's avatar Sato Hiroyuki
Browse files

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
parent e7bcbb95
No related branches found
No related tags found
1 merge request!4224Fix abort gitlab:app:check
Loading
Loading
@@ -5,7 +5,7 @@ module Gitlab
attr_reader :major, :minor, :patch
 
def self.parse(str)
if m = str.match(/(\d+)\.(\d+)\.(\d+)/)
if str && m = str.match(/(\d+)\.(\d+)\.(\d+)/)
VersionInfo.new(m[1].to_i, m[2].to_i, m[3].to_i)
else
VersionInfo.new
Loading
Loading
Loading
Loading
@@ -659,7 +659,7 @@ namespace :gitlab do
current_version = Gitlab::VersionInfo.parse(gitlab_shell_version)
 
print "GitLab Shell version >= #{required_version} ? ... "
if required_version <= current_version
if current_version.valid? && required_version <= current_version
puts "OK (#{current_version})".green
else
puts "FAIL. Please update gitlab-shell to #{required_version} from #{current_version}".red
Loading
Loading
@@ -673,7 +673,7 @@ namespace :gitlab do
puts "Your git bin path is \"#{Gitlab.config.git.bin_path}\""
print "Git version >= #{required_version} ? ... "
 
if required_version <= current_version
if current_version.valid? && required_version <= current_version
puts "yes (#{current_version})".green
else
puts "no".red
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment