Fix dir_exists?

Dmitriy Zaporozhets
1 parent d03964d6
Showing 1 changed file with 8 additions and 3 deletions Show diff stats
app/models/namespace.rb
@@ -51,12 +51,17 @@ class Namespace &lt; ActiveRecord::Base
   end
  
   def ensure_dir_exist
-    dir_exists? || system("mkdir -m 770 #{namespace_dir_path}")
+    unless dir_exists?
+      system("mkdir -m 770 #{namespace_full_path}")
+    end
   end
  
   def dir_exists?
-    namespace_dir_path = File.join(Gitlab.config.gitolite.repos_path, path)
-    File.exists?(namespace_dir_path)
+    File.exists?(namespace_full_path)
+  end
+
+  def namespace_full_path
+    @namespace_full_path ||= File.join(Gitlab.config.gitolite.repos_path, path)
   end
  
   def move_dir
...	...	@@ -51,12 +51,17 @@ class Namespace < ActiveRecord::Base
51	51	end
52	52
53	53	def ensure_dir_exist
54		- dir_exists? \|\| system("mkdir -m 770 #{namespace_dir_path}")
	54	+ unless dir_exists?
	55	+ system("mkdir -m 770 #{namespace_full_path}")
	56	+ end
55	57	end
56	58
57	59	def dir_exists?
58		- namespace_dir_path = File.join(Gitlab.config.gitolite.repos_path, path)
59		- File.exists?(namespace_dir_path)
	60	+ File.exists?(namespace_full_path)
	61	+ end
	62	+
	63	+ def namespace_full_path
	64	+ @namespace_full_path \|\|= File.join(Gitlab.config.gitolite.repos_path, path)
60	65	end
61	66
62	67	def move_dir
...	...