deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix gitolite config checks for old Gitolite versions

Browse source 
Fixes #2608
This commit is contained in:
Riyad Preukschas 2013-01-17 00:43:35 +01:00
parent f254de7337
commit 9cf993972a
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -567,7 +567,7 @@ namespace :gitlab do
else else
# assume older version # assume older version
# see https://github.com/sitaramc/gitolite/blob/v2.3/conf/example.gitolite.rc#L49 # see https://github.com/sitaramc/gitolite/blob/v2.3/conf/example.gitolite.rc#L49
"$GL_GITCONFIG_KEYS" "\\$GL_GITCONFIG_KEYS"
end end
option_value = ".*" option_value = ".*"
if open(gitoliterc_path).grep(/#{option_name}\s*=[>]?\s*["']#{option_value}["']/).any? if open(gitoliterc_path).grep(/#{option_name}\s*=[>]?\s*["']#{option_value}["']/).any?
@ -596,7 +596,7 @@ namespace :gitlab do
else else
# assume older version # assume older version
# see https://github.com/sitaramc/gitolite/blob/v2.3/conf/example.gitolite.rc#L32 # see https://github.com/sitaramc/gitolite/blob/v2.3/conf/example.gitolite.rc#L32
"$REPO_UMASK" "\\$REPO_UMASK"
end end
option_value = "0007" option_value = "0007"
if open(gitoliterc_path).grep(/#{option_name}\s*=[>]?\s*#{option_value}/).any? if open(gitoliterc_path).grep(/#{option_name}\s*=[>]?\s*#{option_value}/).any?