From 5bbcba48f2703a70256b23dbfea80eb1321043a6 Mon Sep 17 00:00:00 2001
From: Floreal Cabanettes <floreal.cabanettes@inra.fr>
Date: Wed, 21 Feb 2018 14:11:18 +0100
Subject: [PATCH] Fix clean jobs
---
src/dgenies/bin/clean_jobs.py | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/dgenies/bin/clean_jobs.py b/src/dgenies/bin/clean_jobs.py
index 5780f2d..963f3d0 100755
--- a/src/dgenies/bin/clean_jobs.py
+++ b/src/dgenies/bin/clean_jobs.py
@@ -47,15 +47,16 @@ def parse_database(app_data, max_age, fake=False):
is_gallery = len(Gallery.select().join(Job).where(Job.id_job == id_job)) > 0
if is_gallery:
gallery_jobs.append(id_job)
- print("Removing job %s..." % id_job)
- data_dir = os.path.join(app_data, id_job)
- if os.path.exists(data_dir) and os.path.isdir(data_dir):
- if not fake:
- shutil.rmtree(data_dir)
else:
- print("Job %s has no data folder!" % id_job)
- if not fake:
- job.delete_instance()
+ print("Removing job %s..." % id_job)
+ data_dir = os.path.join(app_data, id_job)
+ if os.path.exists(data_dir) and os.path.isdir(data_dir):
+ if not fake:
+ shutil.rmtree(data_dir)
+ else:
+ print("Job %s has no data folder!" % id_job)
+ if not fake:
+ job.delete_instance()
return gallery_jobs
--
GitLab