# HG changeset patch
# User Jittat Fakcharoenphol <jittat@gmail.com>
# Date 2010-04-25 05:22:24
# Node ID 0bd22936dfa630e3752329c639e0b92bf6b344c4
# Parent  002d2af06cdb0e8daef48293ca59b82a59f81812
# Parent  f75d1acc9cdd4fd5ce7c2313d4e6dd951ba5080d

Merge branch 'master' of gitorious.org:cafe-grader/cafe-grader-judge-scripts into win-local

diff --git a/lib/dir_init.rb b/lib/dir_init.rb
--- a/lib/dir_init.rb
+++ b/lib/dir_init.rb
@@ -22,10 +22,14 @@
       @usage_filename = usage_filename
     end
 
+    def lock_filename
+      return @dir_name + '/lockfile'
+    end
+
     # Check if someone has initialized the dir.  If not, call block.
 
     def setup    # :yields: block
-      dir = File.new(@dir_name + '/lockfile',"w+")
+      dir = File.new(lock_filename,"w+")
       dir.flock(File::LOCK_EX)
       begin
         counter_filename = get_counter_filename
@@ -64,7 +68,7 @@
     # Check if I am the last one using the dir.  If true, call block.
 
     def teardown
-      dir = File.new(@dir_name)
+      dir = File.new(lock_filename)
       dir.flock(File::LOCK_EX)
       begin
         counter_filename = get_counter_filename