From a0909794618a1ac5aa5665047870c0c0c054749a Mon Sep 17 00:00:00 2001
From: Nikos Skalkotos <skalkoto@grnet.gr>
Date: Thu, 23 May 2013 16:57:01 +0300
Subject: [PATCH] In cleanup_mail sysprep check if mail dirs exist
Check if /var/spool/mail exists before trying to remove the content
of the directory.
---
image_creator/os_type/unix.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/image_creator/os_type/unix.py b/image_creator/os_type/unix.py
index f2abd0e..b0b3ae6 100644
--- a/image_creator/os_type/unix.py
+++ b/image_creator/os_type/unix.py
@@ -85,7 +85,9 @@ class Unix(OSBase):
if print_header:
self.out.output('Removing files under /var/mail & /var/spool/mail')
- self.foreach_file('/var/spool/mail', self.g.rm_rf, maxdepth=1)
+ if self.g.is_dir('/var/spool/mail'):
+ self.foreach_file('/var/spool/mail', self.g.rm_rf, maxdepth=1)
+
self.foreach_file('/var/mail', self.g.rm_rf, maxdepth=1)
@sysprep()
--
GitLab