kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge pull request #4224 from hiroponz/fix-abort-gitlab-app-check 

Fix abort gitlab:app:check
This commit is contained in:
Dmitriy Zaporozhets 2013-06-11 01:48:18 -07:00
parent 1b4a994162 c18564d2cb
commit 9a0e7c0e85
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/gitlab/version_info.rb
View File

@ -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

4
lib/tasks/gitlab/check.rake
View File

@ -661,7 +661,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
@ -675,7 +675,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