diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-11 01:48:18 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-11 01:48:18 -0700 |
| commit | 9a0e7c0e85c4c3892c9a477be98f68c0234599b7 (patch) | |
| tree | febd2fec10d59e46d2708e3659e5c9b205da7b82 | |
| parent | 1b4a994162701f039bc02d155a9dbad55102d618 (diff) | |
| parent | c18564d2cbbffa5d15d2ead97ba0fc4623f77e07 (diff) | |
| download | gitlab-ce-9a0e7c0e85c4c3892c9a477be98f68c0234599b7.tar.gz | |
Merge pull request #4224 from hiroponz/fix-abort-gitlab-app-check
Fix abort gitlab:app:check
| -rw-r--r-- | lib/gitlab/version_info.rb | 2 | ||||
| -rw-r--r-- | lib/tasks/gitlab/check.rake | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/version_info.rb b/lib/gitlab/version_info.rb index 31b72720972..6ee41e85cc9 100644 --- a/lib/gitlab/version_info.rb +++ b/lib/gitlab/version_info.rb @@ -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 diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index 38e8e367904..3d96eab0149 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -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 |