summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorKoen Punt <koen@koenpunt.nl>2012-12-07 01:51:49 +0100
committerKoen Punt <koen@koenpunt.nl>2013-01-03 15:36:50 +0100
commit6b9177ca0209b78398edb409f11bb7b4f5db7ca3 (patch)
treeb5ac343d921b32d7750c363a9483d879c57e53ad /app
parent2095780f24db7c75f5a004654ae2e4052fe16bdd (diff)
downloadgitlab-ce-6b9177ca0209b78398edb409f11bb7b4f5db7ca3.tar.gz
replaced system() calls with FileUtils.* method
This also makes that 'mv: cannot stat `/ho..' is not shown in the test :) consistent spacing require fileutils Revert "require fileutils" This reverts commit 54313d3bbaa60cfc5b405be50cc00b7f6b0cb715. new hash notation FileUtils.mv in begin/rescue block
Diffstat (limited to 'app')
-rw-r--r--app/models/namespace.rb11
1 files changed, 6 insertions, 5 deletions
diff --git a/app/models/namespace.rb b/app/models/namespace.rb
index d34e5a99c79..89c1f9adb5a 100644
--- a/app/models/namespace.rb
+++ b/app/models/namespace.rb
@@ -52,7 +52,7 @@ class Namespace < ActiveRecord::Base
def ensure_dir_exist
unless dir_exists?
- system("mkdir -m 770 #{namespace_full_path}")
+ FileUtils.mkdir( namespace_full_path, mode: 0770 )
end
end
@@ -71,11 +71,12 @@ class Namespace < ActiveRecord::Base
if File.exists?(new_path)
raise "Already exists"
end
-
- if system("mv #{old_path} #{new_path}")
+
+ begin
+ FileUtils.mv( old_path, new_path )
send_update_instructions
@require_update_gitolite = true
- else
+ rescue Exception => e
raise "Namespace move error #{old_path} #{new_path}"
end
end
@@ -88,7 +89,7 @@ class Namespace < ActiveRecord::Base
def rm_dir
dir_path = File.join(Gitlab.config.gitolite.repos_path, path)
- system("rm -rf #{dir_path}")
+ FileUtils.rm_r( dir_path, force: true )
end
def send_update_instructions