change gitolite backend behaviour to prevent error when config directory removed

randx
1 parent 79021e67
Showing 2 changed files with 7 additions and 5 deletions Show diff stats
lib/gitlab/backend/gitolite.rb
lib/gitlab/backend/gitolite_config.rb
@@ -5,7 +5,7 @@ module Gitlab
     class AccessDenied < StandardError; end
     def config
-      @config ||= Gitlab::GitoliteConfig.new
+      Gitlab::GitoliteConfig.new
     end
     def set_key key_id, key_content, projects
@@ -4,8 +4,10 @@ require &#39;fileutils&#39;
 module Gitlab
   class GitoliteConfig
-    def config_tmp_dir
-      @config_tmp_dir ||= File.join(Rails.root, 'tmp',"gitlabhq-gitolite-#{Time.now.to_i}")
+    attr_reader :config_tmp_dir
+
+    def reset_config_tmp_dir
+      @config_tmp_dir = File.join(Rails.root, 'tmp',"gitlabhq-gitolite-#{Time.now.to_i}")
     end
     def apply
@@ -13,9 +15,11 @@ module Gitlab
         File.open(File.join(Rails.root, 'tmp', "gitlabhq-gitolite.lock"), "w+") do |f|
           begin
             f.flock(File::LOCK_EX)
+            reset_config_tmp_dir
             pull
             yield(self)
             push
+            FileUtils.rm_rf(config_tmp_dir)
           ensure
             f.flock(File::LOCK_UN)
           end
@@ -160,8 +164,6 @@ module Gitlab
       `git commit -am "GitLab"`
       `git push`
       Dir.chdir(Rails.root)
-
-      FileUtils.rm_rf(config_tmp_dir)
     end
   end
 end
	@@ -5,7 +5,7 @@ module Gitlab		@@ -5,7 +5,7 @@ module Gitlab
5	class AccessDenied < StandardError; end	5	class AccessDenied < StandardError; end
6		6
7	def config	7	def config
8	- @config \|\|= Gitlab::GitoliteConfig.new	8	+ Gitlab::GitoliteConfig.new
9	end	9	end
10		10
11	def set_key key_id, key_content, projects	11	def set_key key_id, key_content, projects