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

Task#879 Relocated gitolite repo and lock file

Browse source
This commit is contained in:
Zevs 2012-06-04 21:41:26 +03:00
parent a0db028c1b
commit 3ffb9cbfa9
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/gitlab/gitolite.rb
View file

@ -16,7 +16,7 @@ module Gitlab
def pull def pull
# create tmp dir # create tmp dir
@local_dir = File.join(Dir.tmpdir,"gitlabhq-gitolite-#{Time.now.to_i}") @local_dir = File.join(Rails.root, 'tmp',"gitlabhq-gitolite-#{Time.now.to_i}")
Dir.mkdir @local_dir Dir.mkdir @local_dir
`git clone #{GitHost.admin_uri} #{@local_dir}/gitolite` `git clone #{GitHost.admin_uri} #{@local_dir}/gitolite`
@ -33,8 +33,8 @@ module Gitlab
end end
def configure def configure
status = Timeout::timeout(20) do Timeout::timeout(20) do
File.open(File.join(Dir.tmpdir,"gitlabhq-gitolite.lock"), "w+") do |f| File.open(File.join(Rails.root, 'tmp', "gitlabhq-gitolite.lock"), "w+") do |f|
begin begin
f.flock(File::LOCK_EX) f.flock(File::LOCK_EX)
pull pull