diff options
| author | Sato Hiroyuki <sathiroyuki@gmail.com> | 2013-06-06 10:10:51 +0900 |
|---|---|---|
| committer | Sato Hiroyuki <sathiroyuki@gmail.com> | 2013-06-06 10:10:51 +0900 |
| commit | c18564d2cbbffa5d15d2ead97ba0fc4623f77e07 (patch) | |
| tree | 8edc5d27f1c5e3cd28809e9c658b1bf3960bdecf /lib/tasks | |
| parent | e7bcbb95c88a42fc31bc0ccbdf6a819780a612ec (diff) | |
| download | gitlab-ce-c18564d2cbbffa5d15d2ead97ba0fc4623f77e07.tar.gz | |
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
Diffstat (limited to 'lib/tasks')
| -rw-r--r-- | lib/tasks/gitlab/check.rake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index 59c2449444a..c1815b7eee7 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -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 @@ -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 |