deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1582 from Kouno/nfs-fix

Browse source 
Fix deletion of tmp/gitlabhq-gitolite* folders in a NFS environment.
This commit is contained in:
Dmitriy Zaporozhets 2012-09-28 03:07:13 -07:00
commit 9d9493c8d8
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/gitlab/backend/gitolite_config.rb
View file

@ -40,18 +40,22 @@ module Gitlab
# Save changes in # Save changes in
# gitolite-admin repo # gitolite-admin repo
# before pusht it # before push it
ga_repo.save ga_repo.save
# Push gitolite-admin repo # Push gitolite-admin repo
# to apply all changes # to apply all changes
push(config_tmp_dir) push(config_tmp_dir)
# Remove tmp dir
# wiith gitolite-admin
FileUtils.rm_rf(config_tmp_dir)
ensure ensure
# unlock so other task cann access # Remove tmp dir
# 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)
# Unlock so other task can access
# gitolite configuration # gitolite configuration
f.flock(File::LOCK_UN) f.flock(File::LOCK_UN)
end end