Kolab Groupware OBS

pykolab.spec Changed

debian.changelog Changed

pykolab-0.8.10.tar.gz/.arclint -> pykolab-0.8.11.tar.gz/.arclint Changed

pykolab-0.8.10.tar.gz/bin/kolab_smtp_access_policy.py -> pykolab-0.8.11.tar.gz/bin/kolab_smtp_access_policy.py Changed

@@ -20,15 +20,13 @@
 
 import datetime
 import os
+import sqlalchemy
 import sys
 import time
 
 from optparse import OptionParser
 from ConfigParser import SafeConfigParser
 
-cache = None
-
-import sqlalchemy
 from sqlalchemy import Boolean
 from sqlalchemy import Column
 from sqlalchemy import Date
@@ -50,8 +48,6 @@
 from sqlalchemy.schema import Index
 from sqlalchemy.schema import UniqueConstraint
 
-sys.path = ['..','.'] + sys.path
-
 import pykolab
 
 from pykolab import utils
@@ -59,6 +55,10 @@
 from pykolab.constants import *
 from pykolab.translate import _
 
+cache = None
+
+sys.path = ['..', '.'] + sys.path
+
 # TODO: Figure out how to make our logger do some syslogging as well.
 log = pykolab.getLogger('pykolab.smtp_access_policy')
 
@@ -85,27 +85,28 @@
 
 session = None
 policy_result_table = Table(
-        'policy_result', metadata,
-        Column('id', Integer, Sequence('seq_id_result'), primary_key=True),
-        Column('key', String(16), nullable=False),
-        Column('value', Boolean, nullable=False),
-        Column('sender', String(254), nullable=True),
-        Column('recipient', String(254), nullable=False),
-        Column('sasl_username', String(64)),
-        Column('sasl_sender', String(64)),
-        Column('created', Integer, nullable=False),
-        Column('data', PickleType, nullable=True),
-    )
+    'policy_result', metadata,
+    Column('id', Integer, Sequence('seq_id_result'), primary_key=True),
+    Column('key', String(16), nullable=False),
+    Column('value', Boolean, nullable=False),
+    Column('sender', String(254), nullable=True),
+    Column('recipient', String(254), nullable=False),
+    Column('sasl_username', String(64)),
+    Column('sasl_sender', String(64)),
+    Column('created', Integer, nullable=False),
+    Column('data', PickleType, nullable=True),
+)
 
 Index(
-        'fsrss',
-        policy_result_table.c.key,
-        policy_result_table.c.sender,
-        policy_result_table.c.recipient,
-        policy_result_table.c.sasl_username,
-        policy_result_table.c.sasl_sender,
-        unique=True
-    )
+    'fsrss',
+    policy_result_table.c.key,
+    policy_result_table.c.sender,
+    policy_result_table.c.recipient,
+    policy_result_table.c.sasl_username,
+    policy_result_table.c.sasl_sender,
+    unique=True
+)
+
 
 class PolicyResult(object):
     def __init__(
@@ -117,7 +118,7 @@
             sasl_username=None,
             sasl_sender=None,
             data=None
-        ):
+    ):
 
         self.key = key
         self.value = value
@@ -128,24 +129,26 @@
         self.created = (int)(time.time())
         self.data = data
 
+
 mapper(PolicyResult, policy_result_table)
 
 statistic_table = Table(
-        'statistic', metadata,
-        Column('id', Integer, Sequence('seq_id_statistic'), primary_key=True),
-        Column('sender', String(254), nullable=False),
-        Column('recipient', String(254), nullable=False),
-        Column('date', Date, nullable=False),
-        Column('count', Integer, nullable=False),
-    )
+    'statistic', metadata,
+    Column('id', Integer, Sequence('seq_id_statistic'), primary_key=True),
+    Column('sender', String(254), nullable=False),
+    Column('recipient', String(254), nullable=False),
+    Column('date', Date, nullable=False),
+    Column('count', Integer, nullable=False),
+)
 
 Index(
-        'srd',
-        statistic_table.c.sender,
-        statistic_table.c.recipient,
-        statistic_table.c.date,
-        unique=True
-    )
+    'srd',
+    statistic_table.c.sender,
+    statistic_table.c.recipient,
+    statistic_table.c.date,
+    unique=True
+)
+
 
 class Statistic(object):
     def __init__(self, sender, recipient, date=datetime.date.today(), count=0):
@@ -154,10 +157,12 @@
         self.date = date
         self.count = count
 
+
 mapper(Statistic, statistic_table)
 
+
 class PolicyRequest(object):
-    email_address_keys = [ 'sender', 'recipient' ]
+    email_address_keys = ['sender', 'recipient']
     recipients = []
 
     auth = None
@@ -191,7 +196,9 @@
 
             else:
                 if not policy_request['recipient'].strip() == '':
-                    self.recipients = list(set(self.recipients + [policy_request['recipient']]))
+                    self.recipients = list(
+                        set(self.recipients + [policy_request['recipient']])
+                    )
 
     def add_request(self, policy_request={}):
         """
@@ -211,18 +218,18 @@
                 pass
 
         log.debug(
-                _("Adding policy request to instance %s") % (self.instance),
-                level=8
-            )
+            _("Adding policy request to instance %s") % (self.instance),
+            level=8
+        )
 
         # Normalize email addresses (they may contain recipient delimiters)
-        if policy_request.has_key('recipient'):
-            policy_request['recipient'] = normalize_address(
-                    policy_request['recipient']
-                )
+        if 'recipient' in policy_request:
+            policy_request['recipient'] = normalize_address(policy_request['recipient'])
 
             if not policy_request['recipient'].strip() == '':
-                self.recipients = list(set(self.recipients + [policy_request['recipient']]))
+                self.recipients = list(
+                    set(self.recipients + [policy_request['recipient']])
+                )
 
     def parse_ldap_dn(self, dn):
         """
@@ -244,19 +251,16 @@
             return None
 
         if len(ldap_dn) > 0:
-            search_attrs = conf.get_list(
-                    'kolab_smtp_access_policy',
-                    'address_search_attrs'
-                )
+            search_attrs = conf.get_list('kolab_smtp_access_policy', 'address_search_attrs')
 
             rule_subject = self.auth.get_user_attributes(
-                    self.sasl_domain,
-                    { 'dn': dn },
-                    search_attrs + [ 'objectclass' ]

pykolab-0.8.10.tar.gz/configure.ac -> pykolab-0.8.11.tar.gz/configure.ac Changed

pykolab-0.8.10.tar.gz/kolabd/__init__.py -> pykolab-0.8.11.tar.gz/kolabd/__init__.py Changed

pykolab-0.8.10.tar.gz/pykolab/auth/ldap/__init__.py -> pykolab-0.8.11.tar.gz/pykolab/auth/ldap/__init__.py Changed

@@ -502,10 +502,12 @@
         else:
             base_dn = config_base_dn
 
+        _filter = "(%s=%s)" % (unique_attribute, ldap.filter.escape_filter_chars(entry_id))
+
         _search = self.ldap.search_ext(
                 base_dn,
                 ldap.SCOPE_SUBTREE,
-                '(%s=%s)' % (unique_attribute, entry_id),
+                _filter,
                 ['entrydn']
             )
 
@@ -718,7 +720,7 @@
             __filter_prefix = "(&"
             __filter_suffix = "(!(%s=%s)))" % (
                     self.config_get('unique_attribute'),
-                    exclude_entry_id
+                    ldap.filter.escape_filter_chars(exclude_entry_id)
                 )
 
         else:
@@ -794,7 +796,7 @@
             __filter_prefix = "(&"
             __filter_suffix = "(!(%s=%s)))" % (
                     self.config_get('unique_attribute'),
-                    exclude_entry_id
+                    ldap.filter.escape_filter_chars(exclude_entry_id)
                 )
 
         else:
@@ -845,11 +847,8 @@
                 attrsonly=True
             )
 
-        _entry_dns = []
-
-        for _result in _results:
-            (_entry_id, _entry_attrs) = _result
-            _entry_dns.append(_entry_id)
+        # Remove referrals
+        _entry_dns = [_e for _e in _results if _e[0] is not None]
 
         return _entry_dns
 
@@ -1232,7 +1231,7 @@
         else:
             base_dn = config_base_dn
 
-        return self._search(
+        _results = self._search(
                 base_dn,
                 filterstr=_filter,
                 attrlist=[
@@ -1241,6 +1240,11 @@
                 override_search='_regular_search'
             )
 
+        # Remove referrals
+        _entry_dns = [_e for _e in _results if _e[0] is not None]
+
+        return _entry_dns
+
     def set_entry_attribute(self, entry_id, attribute, value):
         log.debug(_("Setting entry attribute %r to %r for %r") % (attribute, value, entry_id), level=8)
         self.set_entry_attributes(entry_id, { attribute: value })
@@ -1296,7 +1300,7 @@
             if not conf.resync:
                 modified_after = self.get_latest_sync_timestamp()
             else:
-                modifytimestamp_format = conf.get_raw('ldap', 'modifytimestamp_format')
+                modifytimestamp_format = conf.get_raw('ldap', 'modifytimestamp_format').replace('%%', '%')
                 if modifytimestamp_format == None:
                     modifytimestamp_format = "%Y%m%d%H%M%SZ"
 
@@ -1306,7 +1310,7 @@
 
         _filter = "(&%s(modifytimestamp>=%s))" % (_filter,modified_after)
 
-        log.debug(_("Using filter %r") % (_filter), level=8)
+        log.debug(_("Synchronization is using filter %r") % (_filter), level=8)
 
         if not mode == 0:
             override_search = mode
@@ -2304,7 +2308,8 @@
         # The list of naming contexts in the LDAP server
         attrs = self.get_entry_attributes("", ['namingContexts'])
 
-        naming_contexts = attrs['namingcontexts']
+        # Lower case of naming contexts - primarily for AD
+        naming_contexts = utils.normalize(attrs['namingcontexts'])
 
         if isinstance(naming_contexts, basestring):
             naming_contexts = [ naming_contexts ]
@@ -2643,6 +2648,9 @@
 
         # Typical for Persistent Change Control EntryChangeNotification
         if kw.has_key('change_type'):
+
+            log.debug(_("change_type defined, typical for Persistent Change Control EntryChangeNotification"), level=5)
+
             change_type = None
 
             change_dict = {
@@ -2693,6 +2701,9 @@
 
         # Typical for Paged Results Control
         elif kw.has_key('entry') and isinstance(kw['entry'], list):
+
+            log.debug(_("No change_type, typical for Paged Results Control"), level=5)
+
             for entry_dn,entry_attrs in kw['entry']:
                 # This is a referral
                 if entry_dn == None:
@@ -2703,7 +2714,7 @@
                 for attr in entry_attrs.keys():
                     entry[attr.lower()] = entry_attrs[attr]
 
-                unique_attr = self.config_get('unique_attribute')
+                unique_attr = self.config_get('unique_attribute').lower()
                 entry['id'] = entry[unique_attr]
 
                 try:
@@ -2711,7 +2722,7 @@
                 except:
                     entry['type'] = "unknown"
 
-                log.debug(_("Entry type: %s") % (entry['type']), level=8)
+                log.debug(_("Entry type for dn: %s is: %s") % (entry['dn'], entry['type']), level=8)
 
                 eval("self._change_none_%s(entry, None)" % (entry['type']))
 
@@ -2878,6 +2889,9 @@
 
                 break
 
+            # Remove referrals
+            _result_data = [_e for _e in _result_data if _e[0] is not None]
+
             if callback:
                 callback(entry=_result_data)

pykolab-0.8.10.tar.gz/pykolab/auth/ldap/cache.py -> pykolab-0.8.11.tar.gz/pykolab/auth/ldap/cache.py Changed

@@ -31,6 +31,8 @@
 from sqlalchemy import create_engine
 from sqlalchemy.orm import mapper
 
+from uuid import UUID
+
 try:
     from sqlalchemy.orm import relationship
 except:
@@ -63,7 +65,7 @@
         self.uniqueid = uniqueid
         self.result_attribute = result_attr
 
-        modifytimestamp_format = conf.get_raw('ldap', 'modifytimestamp_format')
+        modifytimestamp_format = conf.get_raw('ldap', 'modifytimestamp_format').replace('%%', '%')
         if modifytimestamp_format == None:
             modifytimestamp_format = "%Y%m%d%H%M%SZ"
 
@@ -110,52 +112,59 @@
     _entry = None
 
     db = init_db(domain)
+
+    try:
+        _uniqueid = str(UUID(bytes_le=entry['id']))
+        log.debug(_("Entry uniqueid was converted from binary form to string: %s") % _uniqueid, level=8)
+    except ValueError:
+        _uniqueid = entry['id']
+
     try:
-        _entry = db.query(Entry).filter_by(uniqueid=entry['id']).first()
+        _entry = db.query(Entry).filter_by(uniqueid=_uniqueid).first()
     except sqlalchemy.exc.OperationalError, errmsg:
         db = init_db(domain,reinit=True)
     except sqlalchemy.exc.InvalidRequestError, errmsg:
         db = init_db(domain,reinit=True)
     finally:
-        _entry = db.query(Entry).filter_by(uniqueid=entry['id']).first()
+        _entry = db.query(Entry).filter_by(uniqueid=_uniqueid).first()
 
     if not update:
         return _entry
 
     if _entry == None:
-        log.debug(_("Inserting cache entry %r") % (entry['id']), level=8)
+        log.debug(_("Inserting cache entry %r") % (_uniqueid), level=8)
 
         if not entry.has_key(result_attribute):
             entry[result_attribute] = ''
 
         db.add(
                 Entry(
-                        entry['id'],
+                        _uniqueid,
                         entry[result_attribute],
                         entry['modifytimestamp']
                     )
             )
 
         db.commit()
-        _entry = db.query(Entry).filter_by(uniqueid=entry['id']).first()
+        _entry = db.query(Entry).filter_by(uniqueid=_uniqueid).first()
     else:
-        modifytimestamp_format = conf.get_raw('ldap', 'modifytimestamp_format')
+        modifytimestamp_format = conf.get_raw('ldap', 'modifytimestamp_format').replace('%%', '%')
         if modifytimestamp_format == None:
             modifytimestamp_format = "%Y%m%d%H%M%SZ"
 
         if not _entry.last_change.strftime(modifytimestamp_format) == entry['modifytimestamp']:
-            log.debug(_("Updating timestamp for cache entry %r") % (entry['id']), level=8)
+            log.debug(_("Updating timestamp for cache entry %r") % (_uniqueid), level=8)
             last_change = datetime.datetime.strptime(entry['modifytimestamp'], modifytimestamp_format)
             _entry.last_change = last_change
             db.commit()
-            _entry = db.query(Entry).filter_by(uniqueid=entry['id']).first()
+            _entry = db.query(Entry).filter_by(uniqueid=_uniqueid).first()
 
         if entry.has_key(result_attribute):
             if not _entry.result_attribute == entry[result_attribute]:
-                log.debug(_("Updating result_attribute for cache entry %r") % (entry['id']), level=8)
+                log.debug(_("Updating result_attribute for cache entry %r") % (_uniqueid), level=8)
                 _entry.result_attribute = entry[result_attribute]
                 db.commit()
-                _entry = db.query(Entry).filter_by(uniqueid=entry['id']).first()
+                _entry = db.query(Entry).filter_by(uniqueid=_uniqueid).first()
 
     return _entry
 
@@ -189,7 +198,7 @@
     return db[domain]
 
 def last_modify_timestamp(domain):
-    modifytimestamp_format = conf.get_raw('ldap', 'modifytimestamp_format')
+    modifytimestamp_format = conf.get_raw('ldap', 'modifytimestamp_format').replace('%%', '%')
     if modifytimestamp_format == None:
         modifytimestamp_format = "%Y%m%d%H%M%SZ"

pykolab-0.8.10.tar.gz/pykolab/cli/cmd_add_user_subscription.py -> pykolab-0.8.11.tar.gz/pykolab/cli/cmd_add_user_subscription.py Changed

pykolab-0.8.10.tar.gz/pykolab/cli/cmd_list_mailbox_metadata.py -> pykolab-0.8.11.tar.gz/pykolab/cli/cmd_list_mailbox_metadata.py Changed

pykolab-0.8.10.tar.gz/pykolab/cli/cmd_list_user_subscriptions.py -> pykolab-0.8.11.tar.gz/pykolab/cli/cmd_list_user_subscriptions.py Changed

pykolab-0.8.10.tar.gz/pykolab/cli/cmd_mailbox_cleanup.py -> pykolab-0.8.11.tar.gz/pykolab/cli/cmd_mailbox_cleanup.py Changed

@@ -38,12 +38,23 @@
 def cli_options():
     my_option_group = conf.add_cli_parser_option_group(_("CLI Options"))
     my_option_group.add_option(
-            '--dry-run',
-            dest    = "dryrun",
-            action  = "store_true",
-            default = False,
-            help    = _("Do not actually delete mailboxes, but report what mailboxes would have been deleted.")
+        '--dry-run',
+        dest    = "dryrun",
+        action  = "store_true",
+        default = False,
+        help    = _(
+            "Do not actually delete mailboxes, but report what mailboxes would have been deleted."
         )
+    )
+
+    my_option_group.add_option(
+        '--server',
+        dest    = "connect_server",
+        action  = "store",
+        default = None,
+        metavar = "SERVER",
+        help    = _("Evaluate mailboxes on server SERVER only.")
+    )
 
 def description():
     return _("Clean up mailboxes that do no longer have an owner.")
@@ -57,7 +68,11 @@
     domains = auth.list_domains()
 
     imap = IMAP()
-    imap.connect()
+
+    if not conf.connect_server == None:
+        imap.connect(server=conf.connect_server)
+    else:
+        imap.connect()
 
     domain_folders = {}

pykolab-0.8.10.tar.gz/pykolab/cli/cmd_remove_user_subscription.py -> pykolab-0.8.11.tar.gz/pykolab/cli/cmd_remove_user_subscription.py Changed

pykolab-0.8.10.tar.gz/pykolab/constants.py.in -> pykolab-0.8.11.tar.gz/pykolab/constants.py.in Changed

pykolab-0.8.10.tar.gz/pykolab/setup/setup_ldap.py -> pykolab-0.8.11.tar.gz/pykolab/setup/setup_ldap.py Changed

@@ -326,8 +326,8 @@
 
     if os.path.isfile("/usr/sbin/setup-ds-admin.pl"):
         setup_ds_admin = "/usr/sbin/setup-ds-admin.pl"
-    #elif os.path.isfile("/usr/sbin/setup-ds-admin"):
-        #setup_ds_admin = "/usr/sbin/setup-ds-admin"
+    elif os.path.isfile("/usr/sbin/setup-ds-admin"):
+        setup_ds_admin = "/usr/sbin/setup-ds-admin"
     elif os.path.isfile("/usr/sbin/setup-ds.pl"):
         setup_ds_admin = "/usr/sbin/setup-ds.pl"
     elif os.path.isfile("/usr/sbin/setup-ds"):
@@ -417,7 +417,7 @@
         schema_error = True
 
     if os.path.isfile('/bin/systemctl'):
-        subprocess.call(['/bin/systemctl', 'restart', 'dirsrv.target'])
+        subprocess.call(['/bin/systemctl', 'restart', 'dirsrv@' + _input['hostname']])
         time.sleep(20)
     elif os.path.isfile('/sbin/service'):
         subprocess.call(['/sbin/service', 'dirsrv', 'restart'])
@@ -429,7 +429,7 @@
         log.error(_("Could not start the directory server service."))
 
     if os.path.isfile('/bin/systemctl'):
-        subprocess.call(['/bin/systemctl', 'enable', 'dirsrv.target'])
+        subprocess.call(['/bin/systemctl', 'enable', 'dirsrv@' + _input['hostname']])
     elif os.path.isfile('/sbin/chkconfig'):
         subprocess.call(['/sbin/chkconfig', 'dirsrv', 'on'])
     elif os.path.isfile('/usr/sbin/update-rc.d'):

pykolab-0.8.10.tar.gz/pykolab/setup/setup_mta.py -> pykolab-0.8.11.tar.gz/pykolab/setup/setup_mta.py Changed

pykolab-0.8.10.tar.gz/pykolab/setup/setup_php.py -> pykolab-0.8.11.tar.gz/pykolab/setup/setup_php.py Changed

pykolab-0.8.10.tar.gz/pykolab/utils.py -> pykolab-0.8.11.tar.gz/pykolab/utils.py Changed

pykolab-0.8.10.tar.gz/pykolab/xml/event.py -> pykolab-0.8.11.tar.gz/pykolab/xml/event.py Changed

pykolab-0.8.10.tar.gz/pykolab/xml/utils.py -> pykolab-0.8.11.tar.gz/pykolab/xml/utils.py Changed

@@ -85,28 +85,16 @@
             datetime = _datetime.replace(tzinfo=pytz.utc)
         with_timezone = False
 
-    (
-        year,
-        month,
-        day,
-    ) = (
-        _datetime.year,
-        _datetime.month,
-        _datetime.day,
-    )
+    # Sometimes we deal with dummy 00000000T000000 values from iCalendar
+    # in such cases we end up with datetime.time objects
+    if not hasattr(_datetime, 'year'):
+        (year, month, day) = (1970, 1, 1)
+    else:
+        (year, month, day) = (_datetime.year, _datetime.month, _datetime.day)
 
     if hasattr(_datetime, 'hour'):
-        (
-            hour,
-            minute,
-            second
-        ) = (
-            _datetime.hour,
-            _datetime.minute,
-            _datetime.second
-        )
+        (hour, minute, second) = (_datetime.hour, _datetime.minute, _datetime.second)
         _cdatetime = kolabformat.cDateTime(year, month, day, hour, minute, second)
-
     else:
         _cdatetime = kolabformat.cDateTime(year, month, day)

pykolab-0.8.10.tar.gz/share/templates/roundcubemail/config.inc.php.tpl -> pykolab-0.8.11.tar.gz/share/templates/roundcubemail/config.inc.php.tpl Changed

pykolab-0.8.10.tar.gz/tests/unit/test-003-event.py -> pykolab-0.8.11.tar.gz/tests/unit/test-003-event.py Changed

pykolab-0.8.10.tar.gz/wallace/__init__.py -> pykolab-0.8.11.tar.gz/wallace/__init__.py Changed

@@ -286,11 +286,18 @@
             filepath = os.path.join(root, filename)
 
             try:
+                # ignore calls on too young files
                 if os.stat(filepath).st_mtime + 150 > time.time():
-                    log.debug("Skipping %s" % (filepath), level=8)
+                    log.debug("File not more than 150s old. Skipping %s" % (filepath), level=8)
                     continue
 
-            except:
+                # ignore calls on lock files
+                if '/locks/' in filepath:
+                    log.debug("File is in locks directory. Skipping %s" % (filepath), level=8)
+                    continue
+
+            except Exception, errmsg:
+                log.error("Error: %s. Skipping %s" % (errmsg, filepath))
                 continue
 
             if not root == pickup_path:
@@ -501,6 +508,10 @@
                 os.close(1)
                 os.close(2)
 
+                os.open(os.devnull, os.O_RDONLY)
+                os.open(os.devnull, os.O_WRONLY)
+                os.open(os.devnull, os.O_WRONLY)
+
                 log.remove_stdout_handler()
                 self.set_signal_handlers()
                 self.write_pid()

pykolab-0.8.10.tar.gz/wallace/module_invitationpolicy.py -> pykolab-0.8.11.tar.gz/wallace/module_invitationpolicy.py Changed

pykolab-0.8.10.tar.gz/wallace/module_resources.py -> pykolab-0.8.11.tar.gz/wallace/module_resources.py Changed

@@ -324,7 +324,11 @@
             continue
 
         # ignore updates and cancellations to resource collections who already delegated the event
-        if len(receiving_attendee.get_delegated_to()) > 0 or receiving_attendee.get_role() == kolabformat.NonParticipant:
+        att_delegated = (len(receiving_attendee.get_delegated_to()) > 0)
+        att_nonpart = (receiving_attendee.get_role() == kolabformat.NonParticipant)
+        att_rsvp = receiving_attendee.get_rsvp()
+
+        if (att_delegated or att_nonpart) and not att_rsvp:
             done = True
             log.debug(_("Recipient %r is non-participant, ignoring message") % (receiving_resource['mail']), level=8)
 
@@ -334,12 +338,14 @@
                 if resources[resource]['mail'] in [a.get_email() for a in itip_event['xml'].get_attendees()] \
                     and resources[resource].has_key('kolabtargetfolder'):
                     (event, master) = find_existing_event(itip_event['uid'], itip_event['recurrence-id'], resources[resource])
+                    if event is None:
+                        log.debug(_("Cancellation for an event %r: not found, skipping") % (itip_event['uid']), level=8)
                     # remove entire event
-                    if event and master is None:
+                    elif master is None:
                         log.debug(_("Cancellation for entire event %r: deleting") % (itip_event['uid']), level=8)
                         delete_resource_event(itip_event['uid'], resources[resource], event._msguid)
                     # just cancel one single occurrence: add exception with status=cancelled
-                    elif master is not None:
+                    else:
                         log.debug(_("Cancellation for a single occurrence %r of %r: updating...") % (itip_event['recurrence-id'], itip_event['uid']), level=8)
                         event.set_status('CANCELLED')
                         event.set_transparency(True)
@@ -358,7 +364,7 @@
     # do the magic for the receiving attendee
     (available_resource, itip_event) = check_availability(itip_events, resource_dns, resources, receiving_attendee)
 
-    reject = False
+    _reject = False
     resource = None
     original_resource = None
 
@@ -401,10 +407,10 @@
         if invitationpolicy is not None:
             for policy in invitationpolicy:
                 if policy & ACT_REJECT:
-                    reject = True
+                    _reject = True
                     break
 
-    if resource is not None and not reject:
+    if resource is not None and not _reject:
         log.debug(_("Accept invitation for individual resource %r / %r") % (resource['dn'], resource['mail']), level=8)
         accept_reservation_request(itip_event, resource, original_resource, False, invitationpolicy)
     else:

pykolab-0.8.10.tar.gz/wallace/modules.py -> pykolab-0.8.11.tar.gz/wallace/modules.py Changed

pykolab.dsc Changed

Changes of Revision 45