From 14b60bd364a556092e8db554b4a21bcbe43f2623 Mon Sep 17 00:00:00 2001 From: Olivier Sallou Date: Sun, 15 Dec 2013 08:31:15 +0100 Subject: [PATCH] if tmp contains directories, cleanup task fails. Add maanagement for directories --- common/tasks/cleanup.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common/tasks/cleanup.py b/common/tasks/cleanup.py index 7b793a4..5d9dacb 100644 --- a/common/tasks/cleanup.py +++ b/common/tasks/cleanup.py @@ -1,6 +1,7 @@ from base import Task from common import phases import os +import shutil class ClearMOTD(Task): @@ -36,7 +37,10 @@ class CleanTMP(Task): def run(self, info): tmp = os.path.join(info.root, 'tmp') for tmp_file in [os.path.join(tmp, f) for f in os.listdir(tmp)]: - os.remove(tmp_file) + if os.path.isfile(tmp_file): + os.remove(tmp_file) + else: + shutil.rmtree(tmp_file) log = os.path.join(info.root, 'var/log/') os.remove(os.path.join(log, 'bootstrap.log'))