D3872.1775201172.diff
No OneTemporary
Actions

Authored By

Unknown

Size

1 KB

Referenced Files

None

Subscribers

None

D3872.1775201172.diff
View Options

	diff --git a/pykolab/cli/cmd_sync.py b/pykolab/cli/cmd_sync.py
	--- a/pykolab/cli/cmd_sync.py
	+++ b/pykolab/cli/cmd_sync.py
	@@ -74,20 +74,20 @@
	auth = Auth()

	if conf.domain == "all":
	- log.debug(_("Listing domains..."), level=5)
	- start_time = time.time()
	- domains = auth.list_domains()
	- end_time = time.time()
	- log.debug(
	+ log.debug(_("Listing domains..."), level=5)
	+ start_time = time.time()
	+ domains = auth.list_domains()
	+ end_time = time.time()
	+ log.debug(
	_("Found %d domains in %d seconds") % (
	- len(domains),
	- (end_time-start_time)
	- ),
	+ len(domains),
	+ (end_time-start_time)
	+ ),
	level=8
	)
	else:
	- domains = {}
	- domains[conf.domain] = conf.domain
	+ domains = {}
	+ domains[conf.domain] = conf.domain

	if version.StrictVersion(sys.version[:3]) >= version.StrictVersion("2.7"):
	pool = multiprocessing.Pool(conf.threads, worker_process, (), 1)
	@@ -125,14 +125,13 @@
	entry = utils.normalize(kw)

	mailbox_attribute = conf.get('cyrus-sasl', 'result_attribute')
	- if mailbox_attribute == None:
	+ if mailbox_attribute is None:
	mailbox_attribute = 'mail'

	-
	if mailbox_attribute not in entry:
	return

	- if not 'kolabinetorgperson' in entry['objectclass']:
	+ if 'kolabinetorgperson' not in entry['objectclass']:
	return

	imap = IMAP()