summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Hoffend <dh@dotlan.net>2014-09-14 02:18:04 +0200
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2015-01-26 00:00:28 +0100
commit040338f53d522a359e0e56b67c92fe6ea47ee213 (patch)
treebbbe439a66cd3b62c5d812ea216c33beaa471c83
parenta09efe429b573570b03ae180c407a59baba86089 (diff)
downloadpykolab-040338f53d522a359e0e56b67c92fe6ea47ee213.tar.gz
fixed import of roundcube mysql.initial.sql
-rw-r--r--pykolab/setup/setup_roundcube.py7
1 files changed, 4 insertions, 3 deletions
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)