OSDN Git Service

Apparently the gitlab Travis install has no git user.
authorMitch Tishmack <mitch.tishmack@gmail.com>
Thu, 23 May 2013 17:52:38 +0000 (12:52 -0500)
committerMitch Tishmack <mitch.tishmack@gmail.com>
Thu, 23 May 2013 17:52:38 +0000 (12:52 -0500)
Hackily handle this with a begin block and return a default that matches current use.

config/initializers/1_settings.rb

index 664ca5c..3511859 100644 (file)
@@ -58,7 +58,11 @@ Settings.gitlab['email_from'] ||= "gitlab@#{Settings.gitlab.host}"
 Settings.gitlab['support_email']  ||= Settings.gitlab.email_from
 Settings.gitlab['url']        ||= Settings.send(:build_gitlab_url)
 Settings.gitlab['user']       ||= 'git'
-Settings.gitlab['user_home']  ||= Etc.getpwnam(Settings.gitlab['user']).dir
+Settings.gitlab['user_home']  ||= begin
+  Etc.getpwnam(Settings.gitlab['user']).dir
+rescue ArgumentError # no user configured
+  '/home/' + Settings.gitlab['user']
+end
 Settings.gitlab['signup_enabled'] ||= false
 Settings.gitlab['username_changing_enabled'] = true if Settings.gitlab['username_changing_enabled'].nil?
 Settings.gitlab['default_projects_features'] ||= {}