From 1fe45898d7871512bb25b5c314301221420c560b Mon Sep 17 00:00:00 2001 From: Vincent Bonmalais Date: Fri, 28 Sep 2012 14:42:31 +1000 Subject: [PATCH] Fix deletion of tmp/gitlabhq-gitolite* folders in a NFS environment. --- lib/gitlab/backend/gitolite_config.rb | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/gitlab/backend/gitolite_config.rb b/lib/gitlab/backend/gitolite_config.rb index ffe15fb..ed366f6 100644 --- a/lib/gitlab/backend/gitolite_config.rb +++ b/lib/gitlab/backend/gitolite_config.rb @@ -40,18 +40,22 @@ module Gitlab # Save changes in # gitolite-admin repo - # before pusht it + # before push it ga_repo.save # Push gitolite-admin repo # to apply all changes push(config_tmp_dir) - + ensure # Remove tmp dir - # wiith gitolite-admin + # removing the gitolite folder first is important to avoid + # NFS issues. + FileUtils.rm_rf(File.join(config_tmp_dir, 'gitolite')) + + # Remove parent tmp dir FileUtils.rm_rf(config_tmp_dir) - ensure - # unlock so other task cann access + + # Unlock so other task can access # gitolite configuration f.flock(File::LOCK_UN) end -- libgit2 0.21.2