From 30a43b7e04b98616f379bdd800532c3354df8b19 Mon Sep 17 00:00:00 2001 From: Nick Thomas Date: Tue, 23 Jan 2018 19:03:02 +0000 Subject: Fix export removal for hashed-storage projects within a renamed or deleted namespace --- app/models/concerns/storage/legacy_namespace.rb | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'app/models/concerns/storage') diff --git a/app/models/concerns/storage/legacy_namespace.rb b/app/models/concerns/storage/legacy_namespace.rb index 99dbd4fbacf..b12c10a84de 100644 --- a/app/models/concerns/storage/legacy_namespace.rb +++ b/app/models/concerns/storage/legacy_namespace.rb @@ -87,20 +87,10 @@ module Storage remove_exports! end - def remove_exports! - Gitlab::Popen.popen(%W(find #{export_path} -not -path #{export_path} -delete)) - end - - def export_path - File.join(Gitlab::ImportExport.storage_path, full_path_was) - end + def remove_legacy_exports! + legacy_export_path = File.join(Gitlab::ImportExport.storage_path, full_path_was) - def full_path_was - if parent - parent.full_path + '/' + path_was - else - path_was - end + FileUtils.rm_rf(legacy_export_path) end end end -- cgit v1.2.3