From 7192f86ed0e2eec1bee94ee148253c1e65f925e3 Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Fri, 26 Oct 2012 02:32:17 +0200 Subject: [PATCH] Fix Satellite#lock --- lib/gitlab/satellite/satellite.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/gitlab/satellite/satellite.rb b/lib/gitlab/satellite/satellite.rb index 0b8d42ae8..28b6f538d 100644 --- a/lib/gitlab/satellite/satellite.rb +++ b/lib/gitlab/satellite/satellite.rb @@ -25,14 +25,18 @@ module Gitlab File.exists? path end - # Locks the satellite and yields + # * Locks the satellite + # * Changes the current directory to the satellite's working dir + # * Yields def lock raise "Satellite doesn't exist" unless exists? File.open(lock_file, "w+") do |f| f.flock(File::LOCK_EX) - return yield + Dir.chdir(path) do + return yield + end end end -- 2.11.0