2 commits - configure.ac pykolab/setup

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Mon Jan 26 00:00:55 CET 2015


 configure.ac                     |    2 +-
 pykolab/setup/setup_roundcube.py |    7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 040338f53d522a359e0e56b67c92fe6ea47ee213
Author: Daniel Hoffend <dh at dotlan.net>
Date:   Sun Sep 14 02:18:04 2014 +0200

    fixed import of roundcube mysql.initial.sql

diff --git a/pykolab/setup/setup_roundcube.py b/pykolab/setup/setup_roundcube.py
index c6a0e33..739da11 100644
--- a/pykolab/setup/setup_roundcube.py
+++ b/pykolab/setup/setup_roundcube.py
@@ -146,12 +146,13 @@ def execute(*args, **kw):
 
     schema_files = []
     for root, directories, filenames in os.walk('/usr/share/doc/'):
+        directories.sort()
         for directory in directories:
             if directory.startswith("roundcubemail"):
-                for root, directories, filenames in os.walk(os.path.join(root, directory)):
-                    for filename in filenames:
+                for nested_root, nested_directories, nested_filenames in os.walk(os.path.join(root, directory)):
+                    for filename in nested_filenames:
                         if filename.startswith('mysql.initial') and filename.endswith('.sql'):
-                            schema_filepath = os.path.join(root,filename)
+                            schema_filepath = os.path.join(nested_root,filename)
                             if not schema_filepath in schema_files:
                                 schema_files.append(schema_filepath)
 


commit a09efe429b573570b03ae180c407a59baba86089
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri Jan 23 22:24:36 2015 +0100

    Set version to 0.7.7

diff --git a/configure.ac b/configure.ac
index ee39aed..8c01473 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([pykolab], 0.7.6)
+AC_INIT([pykolab], 0.7.7)
 AC_SUBST([RELEASE], 1)
 
 AC_CONFIG_SRCDIR(pykolab/constants.py.in)




More information about the commits mailing list