File tree 3 files changed +8
-4
lines changed
3 files changed +8
-4
lines changed Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ def image_for_param(bool)
20
20
21
21
22
22
def render_gitolite_version ( version )
23
- if version <= 0
23
+ if version . nil?
24
24
css_class = 'label label-important'
25
25
label = l ( :label_unknown_gitolite_version )
26
26
else
Original file line number Diff line number Diff line change @@ -23,6 +23,10 @@ def gitolite_infos
23
23
24
24
25
25
def sudo_update_gitolite!
26
+ if gitolite_command . nil?
27
+ logger . error ( "gitolite_command is nil, can't update Gitolite !" )
28
+ return
29
+ end
26
30
logger . info ( "Running '#{ gitolite_command . join ( ' ' ) } ' on the Gitolite install ..." )
27
31
begin
28
32
sudo_shell ( *gitolite_command )
Original file line number Diff line number Diff line change @@ -21,7 +21,7 @@ def gitolite_infos
21
21
begin
22
22
RedmineGitHosting ::Commands . gitolite_infos
23
23
rescue RedmineGitHosting ::Error ::GitoliteCommandException => e
24
- logger . error ( 'Error while getting Gitolite infos' )
24
+ logger . error ( 'Error while getting Gitolite infos, check your SSH keys path or your Git user. ' )
25
25
nil
26
26
end
27
27
end
@@ -40,14 +40,14 @@ def gitolite_banner
40
40
41
41
42
42
def find_version ( output )
43
- return 0 if output . blank?
43
+ return nil if output . blank?
44
44
line = output . split ( "\n " ) [ 0 ]
45
45
if line =~ /gitolite[ -]v?2./
46
46
2
47
47
elsif line . include? ( 'running gitolite3' )
48
48
3
49
49
else
50
- 0
50
+ nil
51
51
end
52
52
end
53
53
You can’t perform that action at this time.
0 commit comments