Download as
Browse Code »

Commit 9a0e7c0e85c4c3892c9a477be98f68c0234599b7

Authored by Dmitriy Zaporozhets
2 parents 1b4a9941 c18564d2
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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

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