summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiutauras Adomaitis <adomaitis@kolabsys.com>2017-09-27 10:24:26 +0300
committerLiutauras Adomaitis <adomaitis@kolabsys.com>2018-03-12 14:21:08 +0200
commit3bfbef3a3ed8b5a7f6de0d5fd57ffabaaf582f7a (patch)
treeaedabe550407870be1d5e49099bb3308f00c3505
parent340eb5edbe525474fe7a1ce7369e6416ca9b10c8 (diff)
downloadpykolab-3bfbef3a3ed8b5a7f6de0d5fd57ffabaaf582f7a.tar.gz
Fix the problem with undelete-mailbox command when listing deleted mailboxes command actually doesn't replace placeholders with values, which prevents correctly list deleted mailboxes and then undelete them.
Summary: T2648 Test Plan: none Reviewers: vanmeeuwen, machniak, mollekopf Reviewed By: mollekopf Subscribers: mollekopf, machniak, vanmeeuwen Maniphest Tasks: T2648 Differential Revision: https://git.kolab.org/D548
-rw-r--r--pykolab/imap/cyrus.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/pykolab/imap/cyrus.py b/pykolab/imap/cyrus.py
index 1371dff..27f889b 100644
--- a/pykolab/imap/cyrus.py
+++ b/pykolab/imap/cyrus.py
@@ -587,8 +587,7 @@ class Cyrus(cyruslib.CYRUS):
TODO: It finds virtdomain folders for non-virtdomain searches.
"""
- deleted_folder_search = "%(deleted_prefix)s%(separator)s" + \
- "%(mailfolder)s%(separator)s*" % {
+ deleted_folder_search = "%(deleted_prefix)s%(separator)s%(mailfolder)s%(separator)s*" % {
# TODO: The prefix used is configurable
'deleted_prefix': "DELETED",
'mailfolder': self.separator.join(mbox['path_parts']),