From e300242a2570c3f5aa7233e90893e2372594b5f3 Mon Sep 17 00:00:00 2001 From: Owen W. Taylor Date: Aug 16 2017 11:20:37 +0000 Subject: Don't remove compose dir when removing a compose with reused_id As long as the original compose exists, we shouldn't remove the compose dir - the original compose may have been reused again and had its time_to_expire updated. --- diff --git a/server/odcs/server/backend.py b/server/odcs/server/backend.py index 83edb0c..adddb45 100644 --- a/server/odcs/server/backend.py +++ b/server/odcs/server/backend.py @@ -129,7 +129,7 @@ class ExpireThread(BackendThread): compose.state = COMPOSE_STATES["removed"] compose.time_removed = datetime.utcnow() db.session.commit() - if os.path.exists(compose.toplevel_dir): + if not compose.reused_id and os.path.exists(compose.toplevel_dir): self._remove_compose_dir(compose.toplevel_dir)