Commit 9cab79cb authored by Riyad Preukschas's avatar Riyad Preukschas

Fix gitolite config checks for old Gitolite versions

Fixes #2608
parent 8f9dec28
...@@ -570,7 +570,7 @@ namespace :gitlab do ...@@ -570,7 +570,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?
...@@ -599,7 +599,7 @@ namespace :gitlab do ...@@ -599,7 +599,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?
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment