Check if ruby-uuid is writable

* It might have been claimed by another user on the system already
jonhyman · Jul 19, 2011 · ce8e579 · ce8e579
1 parent d83f26d
commit ce8e579
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    uuid (2.3.1)
+    uuid (2.3.2)
       macaddr (~> 1.0)
 
 GEM

diff --git a/lib/uuid.rb b/lib/uuid.rb
@@ -167,9 +167,9 @@ def self.state_file(mode = 0644)
       state_dir = File.join('', 'var', 'tmp')
     end
 
-    if File.writable?(state_dir) then
-      @state_file = File.join(state_dir, 'ruby-uuid')
-    else
+    @state_file = File.join(state_dir, 'ruby-uuid')
+
+    if !File.writable?(state_dir) || (File.exists?(@state_file) && !File.writabe?(@state_file)) then
       @state_file = File.expand_path('.ruby-uuid', '~')
     end