Request 2589 (accepted)

Overview

Request 2589 (accepted)

Check in 0.8.15

Created by vanmeeuwen over 5 years ago
In state accepted

Submit pykolab

Submit package Kolab:Winterfell / pykolab to package Kolab:16 / pykolab

pykolab.spec Changed

debian.changelog Changed

pykolab-0.8.14.tar.gz/configure.ac -> pykolab-0.8.15.tar.gz/configure.ac Changed

pykolab-0.8.14.tar.gz/pykolab/auth/ldap/__init__.py -> pykolab-0.8.15.tar.gz/pykolab/auth/ldap/__init__.py Changed

@@ -1298,15 +1298,20 @@
             if not conf.resync:
                 modified_after = self.get_latest_sync_timestamp()
             else:
-                modifytimestamp_format = conf.get_raw('ldap', 'modifytimestamp_format').replace('%%', '%')
-                if modifytimestamp_format == None:
-                    modifytimestamp_format = "%Y%m%d%H%M%SZ"
+                modifytimestamp_format = conf.get_raw(
+                    'ldap',
+                    'modifytimestamp_format',
+                    default="%Y%m%d%H%M%SZ"
+                ).replace('%%', '%')
+
+                modified_after = datetime.datetime(1900, 01, 01, 00, 00, 00).strftime(
+                    modifytimestamp_format
+                )
 
-                modified_after = datetime.datetime(1900, 01, 01, 00, 00, 00).strftime(modifytimestamp_format)
         else:
             modified_after = self.get_latest_sync_timestamp()
 
-        _filter = "(&%s(modifytimestamp>=%s))" % (_filter,modified_after)
+        _filter = "(&%s(modifytimestamp>=%s))" % (_filter, modified_after)
 
         log.debug(_("Synchronization is using filter %r") % (_filter), level=8)
 
@@ -1318,7 +1323,7 @@
         config_base_dn = self.config_get('base_dn')
         ldap_base_dn = self._kolab_domain_root_dn(self.domain)
 
-        if not ldap_base_dn == None and not ldap_base_dn == config_base_dn:
+        if ldap_base_dn is not None and not ldap_base_dn == config_base_dn:
             base_dn = ldap_base_dn
         else:
             base_dn = config_base_dn

pykolab-0.8.14.tar.gz/pykolab/auth/ldap/cache.py -> pykolab-0.8.15.tar.gz/pykolab/auth/ldap/cache.py Changed

@@ -65,14 +65,16 @@
         self.uniqueid = uniqueid
         self.result_attribute = result_attr
 
-        modifytimestamp_format = conf.get_raw('ldap', 'modifytimestamp_format').replace('%%', '%')
-        if modifytimestamp_format == None:
-            modifytimestamp_format = "%Y%m%d%H%M%SZ"
+        modifytimestamp_format = conf.get_raw(
+            'ldap',
+            'modifytimestamp_format',
+            default="%Y%m%d%H%M%SZ"
+        ).replace('%%', '%')
 
         self.last_change = datetime.datetime.strptime(
                 last_change,
-                modifytimestamp_format
-            )
+            modifytimestamp_format
+        )
 
 ##
 ## Tables
@@ -148,9 +150,11 @@
         db.commit()
         _entry = db.query(Entry).filter_by(uniqueid=_uniqueid).first()
     else:
-        modifytimestamp_format = conf.get_raw('ldap', 'modifytimestamp_format').replace('%%', '%')
-        if modifytimestamp_format == None:
-            modifytimestamp_format = "%Y%m%d%H%M%SZ"
+        modifytimestamp_format = conf.get_raw(
+            'ldap',
+            'modifytimestamp_format',
+            default="%Y%m%d%H%M%SZ"
+        ).replace('%%', '%')
 
         if not _entry.last_change.strftime(modifytimestamp_format) == entry['modifytimestamp']:
             log.debug(_("Updating timestamp for cache entry %r") % (_uniqueid), level=8)
@@ -198,9 +202,11 @@
     return db[domain]
 
 def last_modify_timestamp(domain):
-    modifytimestamp_format = conf.get_raw('ldap', 'modifytimestamp_format').replace('%%', '%')
-    if modifytimestamp_format == None:
-        modifytimestamp_format = "%Y%m%d%H%M%SZ"
+    modifytimestamp_format = conf.get_raw(
+        'ldap',
+        'modifytimestamp_format',
+        "%Y%m%d%H%M%SZ"
+    ).replace('%%', '%')
 
     try:
         db = init_db(domain)

pykolab-0.8.14.tar.gz/pykolab/conf/__init__.py -> pykolab-0.8.15.tar.gz/pykolab/conf/__init__.py Changed

pykolab-0.8.14.tar.gz/pykolab/setup/setup_mysql.py -> pykolab-0.8.15.tar.gz/pykolab/setup/setup_mysql.py Changed

@@ -39,15 +39,22 @@
 
 
 def cli_options():
-    ldap_group = conf.add_cli_parser_option_group(_("MySQL Options"))
+    mysql_group = conf.add_cli_parser_option_group(_("MySQL Options"))
 
-    ldap_group.add_option(
+    mysql_group.add_option(
         "--mysqlserver",
         dest="mysqlserver",
         action="store",
         help=_("Specify whether to use an (existing) or (new) MySQL server.")
     )
 
+    mysql_group.add_option(
+        "--mysqlrootpw",
+        dest="mysqlrootpw",
+        action="store",
+        help=_("The MySQL root user password.")
+    )
+
 
 def description():
     return _("Setup MySQL.")
@@ -119,17 +126,21 @@
             answer = utils.ask_menu(_("What MySQL server are we setting up?"), options)
 
     if answer == "1" or answer == 1:
-        print >> sys.stderr, utils.multiline_message(
-            _("""
-                Please supply the root password for MySQL, so we can set
-                up user accounts for other components that use MySQL.
-            """)
-        )
-
-        mysql_root_password = utils.ask_question(
-            _("MySQL root password"),
-            password=True
-        )
+        if not conf.mysqlrootpw:
+            print >> sys.stderr, utils.multiline_message(
+                _("""
+                    Please supply the root password for MySQL, so we can set
+                    up user accounts for other components that use MySQL.
+                """)
+            )
+
+            mysql_root_password = utils.ask_question(
+                _("MySQL root password"),
+                password=True
+            )
+
+        else:
+            mysql_root_password = conf.mysqlrootpw
 
     else:
         print >> sys.stderr, utils.multiline_message(

pykolab-0.8.14.tar.gz/wallace/__init__.py -> pykolab-0.8.15.tar.gz/wallace/__init__.py Changed

pykolab.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2589 0

Request History

vanmeeuwen created request over 5 years ago

Check in 0.8.15

vanmeeuwen accepted review over 5 years ago

vanmeeuwen approved review over 5 years ago

vanmeeuwen accepted request over 5 years ago