Branch 'pykolab-0.5' - 2 commits - configure.ac pykolab/setup

[Jeroen van Meeuwen]

 configure.ac                |    2 +-
 pykolab/setup/setup_ldap.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9fef3d45ba11645ecf5cb8bc9d8feaac09cfdc8b
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri Dec 21 18:15:40 2012 +0100

    Bump release

diff --git a/configure.ac b/configure.ac
index 2293854..d54fc4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT([pykolab], 0.5.9)
-AC_SUBST([RELEASE], 2)
+AC_SUBST([RELEASE], 3)
 
 AC_CONFIG_SRCDIR(pykolab/constants.py.in)
 


commit c0036ddc4fc497833544ed0f38320337dd40dee6
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri Dec 21 18:15:01 2012 +0100

    Fix error in if clause logic

diff --git a/pykolab/setup/setup_ldap.py b/pykolab/setup/setup_ldap.py
index f699e4c..dd06293 100644
--- a/pykolab/setup/setup_ldap.py
+++ b/pykolab/setup/setup_ldap.py
@@ -286,7 +286,7 @@ ServerAdminPwd = %(admin_pass)s
     schema_file = None
     for root, directories, filenames in os.walk('/usr/share/doc/'):
         for filename in filenames:
-            if filename.startswith('kolab') and filename.endswith('.ldif') and not schema_file == None:
+            if filename.startswith('kolab') and filename.endswith('.ldif') and schema_file == None:
                 schema_file = os.path.join(root,filename)
 
     if not schema_file == None: