Commit 9d9493c8 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #1582 from Kouno/nfs-fix

Fix deletion of tmp/gitlabhq-gitolite* folders in a NFS environment.
parents 7ded8584 1fe45898
...@@ -40,18 +40,22 @@ module Gitlab ...@@ -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)
ensure
# Remove tmp dir # 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) FileUtils.rm_rf(config_tmp_dir)
ensure
# unlock so other task cann access # Unlock so other task can access
# gitolite configuration # gitolite configuration
f.flock(File::LOCK_UN) f.flock(File::LOCK_UN)
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment