Fix deleting storage policy

Crystal-SDS · Nov 15, 2017 · cf3a6b8 · cf3a6b8
1 parent 5a984d4
commit cf3a6b8
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/api/swift_api/views.py b/api/swift_api/views.py
@@ -149,10 +149,13 @@ def storage_policy_detail(request, storage_policy_id):
     if request.method == 'DELETE':
         if r.exists(key):
             try:
-                policy_file_path = get_policy_file_path(settings.SWIFT_CFG_DEPLOY_DIR, storage_policy_id)
-                if os.path.isfile(policy_file_path):
-                    os.remove(policy_file_path)
-                os.remove(get_policy_file_path(settings.SWIFT_CFG_TMP_DIR, storage_policy_id))
+                policy_file_path_dep = get_policy_file_path(settings.SWIFT_CFG_DEPLOY_DIR, storage_policy_id)
+                if os.path.isfile(policy_file_path_dep):
+                    os.remove(policy_file_path_dep)
+
+                policy_file_path_tmp = get_policy_file_path(settings.SWIFT_CFG_TMP_DIR, storage_policy_id)
+                if os.path.isfile(policy_file_path_tmp):
+                    os.remove(policy_file_path_tmp)
 
                 deploy_swift_file = get_swift_cfg_path(settings.SWIFT_CFG_DEPLOY_DIR)