pykolab/cli pykolab/imap
Jeroen van Meeuwen
vanmeeuwen at kolabsys.com
Wed Oct 16 12:29:51 CEST 2013
pykolab/cli/cmd_delete_mailbox.py | 4 ++++
pykolab/imap/cyrus.py | 5 ++++-
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit dabfc90867c47a99ae57bcba12073e2a4dbc244f
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Wed Oct 16 12:28:37 2013 +0200
Escape the necessary spaces in verifying the folder to delete (#2298)
diff --git a/pykolab/cli/cmd_delete_mailbox.py b/pykolab/cli/cmd_delete_mailbox.py
index 61bc278..0ef83fb 100644
--- a/pykolab/cli/cmd_delete_mailbox.py
+++ b/pykolab/cli/cmd_delete_mailbox.py
@@ -52,6 +52,10 @@ def execute(*args, **kw):
delete_folders = imap.list_folders(delete_folder)
+ if len(delete_folders) == 0:
+ print >> sys.stderr, _("No such folder(s)")
+ sys.exit(1)
+
for delete_folder in delete_folders:
imap.delete_mailfolder(delete_folder)
diff --git a/pykolab/imap/cyrus.py b/pykolab/imap/cyrus.py
index 9fa6feb..6034b48 100644
--- a/pykolab/imap/cyrus.py
+++ b/pykolab/imap/cyrus.py
@@ -376,7 +376,10 @@ class Cyrus(cyruslib.CYRUS):
if not mbox['domain'] == None:
verify_folder_search = "%s@%s" % (verify_folder_search, mbox['domain'])
- folders = self.lm(verify_folder_search)
+ if ' ' in verify_folder_search:
+ folders = self.lm('"%s"' % verify_folder_search)
+ else:
+ folders = self.lm(verify_folder_search)
# NOTE: Case also covered is valid hexadecimal folders; won't be the
# actual check as intended, but doesn't give you anyone else's data
More information about the commits
mailing list