# HG changeset patch # User dfraser # Date 1236956626 0 # Node ID a87ff6fc96b9e0cc3fb2972850b41214effd5720 # Parent 384e59137bf8d3c08a1b8d7766d751e95006fb97 Handle removing log files only if present, and report error if could not remove in log rather than aborting operation diff --git a/bitten/model.py b/bitten/model.py --- a/bitten/model.py +++ b/bitten/model.py @@ -726,7 +726,18 @@ log_files = cursor.fetchall() or [] cursor.execute("DELETE FROM bitten_log WHERE id=%s", (self.id,)) for log_file in log_files: - os.remove(self.get_log_file(log_file[0])) + log_file = self.get_log_file(log_file[0]) + if os.path.exists(log_file): + try: + os.remove(log_file) + except Exception, e: + self.env.log.warning("Error removing log file %s: %s" % (log_file, e)) + level_file = self.get_log_file(log_file[1]) + if os.path.exists(log_file): + try: + os.remove(level_file) + except Exception, e: + self.env.log.warning("Error removing log file %s: %s" % (log_file, e)) if handle_ta: db.commit()