summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2011-11-04 11:39:51 +0000
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2011-11-04 11:39:51 +0000
commitb6ba2d8b09a60e30abc2ad576bc5fb5126d16ccb (patch)
tree71b7db998f019471b582eef6c440d6aad8023c57
parent30bf4a165eda33c14d493cdd2e91e5f0b3f614b9 (diff)
downloadpykolab-b6ba2d8b09a60e30abc2ad576bc5fb5126d16ccb.tar.gz
Merge stash - no changes
-rw-r--r--Makefile.am4
-rw-r--r--cyruslib.py2
-rw-r--r--pykolab/imap/cyrus.py2
-rw-r--r--pykolab/plugins/defaultfolders/__init__.py1
4 files changed, 6 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 7b52297..d9bd36f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,9 +44,9 @@ tarball:
make dist
ChangeLog:
- (GIT_DIR=.git git log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+ (GIT_DIR=.git git log $(PACKAGE)-$(VERSION) > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
-srpm: ChangeLog dist
+srpm: ChangeLog tarball
@rpmbuild -ts $(PACKAGE)-$(VERSION).tar.gz
rpm: srpm
diff --git a/cyruslib.py b/cyruslib.py
index 6f2d836..7df43a0 100644
--- a/cyruslib.py
+++ b/cyruslib.py
@@ -490,7 +490,7 @@ class CYRUS:
if pattern == '%':
res, ml = self.__docommand('list', '', '%')
else:
- res, ml = self.__docommand('list', '*', self.decode(pattern))
+ res, ml = self.__docommand('list', '""', self.decode(pattern))
if not ok(res):
self.__verbose( '[LIST] %s: %s' % (res, ml) )
diff --git a/pykolab/imap/cyrus.py b/pykolab/imap/cyrus.py
index c0f8c04..de66355 100644
--- a/pykolab/imap/cyrus.py
+++ b/pykolab/imap/cyrus.py
@@ -117,6 +117,8 @@ class Cyrus(cyruslib.CYRUS):
if len(self.lm(mailfolder)) < 1:
return self.server
+ # TODO: Murder capabilities may have been suppressed using Cyrus IMAP
+ # configuration.
if not self.murder:
return self.server
diff --git a/pykolab/plugins/defaultfolders/__init__.py b/pykolab/plugins/defaultfolders/__init__.py
index 91db993..0b737e6 100644
--- a/pykolab/plugins/defaultfolders/__init__.py
+++ b/pykolab/plugins/defaultfolders/__init__.py
@@ -44,6 +44,7 @@ class KolabDefaultfolders(object):
"""
if not kw.has_key('additional_folders'):
+ log.error(_("Plugin %s called without required keyword %s.") %("defaultfolders", "additional_folders"))
return {}
try: