From c94f0847ceaaee86f40b7a10f46a867f14ec4c35 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Tue, 12 Jun 2012 13:31:40 +0200 Subject: [PATCH] *path* must be set even if CREATE_DIRECTORIES is disabled. fixes #263 --- admin/models.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/admin/models.py b/admin/models.py index 9168c099b..beaddc155 100644 --- a/admin/models.py +++ b/admin/models.py @@ -527,13 +527,13 @@ class Mailbox(DatesAware): return len(self.alias_set.all()) def create_dir(self): + if self.mbtype == "mbox": + self.path = "%s/Inbox" % self.address + else: + self.path = "%s/" % self.address if parameters.get_admin("CREATE_DIRECTORIES") == "yes": relpath = "%s/%s" % (self.domain.name, self.address) abspath = os.path.join(parameters.get_admin("STORAGE_PATH"), relpath) - if self.mbtype == "mbox": - self.path = "%s/Inbox" % self.address - else: - self.path = "%s/" % self.address if os.path.exists(abspath): return True if not exec_as_vuser("mkdir -p %s" % abspath): @@ -562,6 +562,8 @@ class Mailbox(DatesAware): if code: self.path = "%s/" % newaddress return code + else: + self.path ="%s/" % newaddress return True