File setup_roundcube.patch of Package pykolab

File setup_roundcube.patch of Package pykolab (Revision 36bc332b4d2484ff57931a942c5bbe30)

Currently displaying revision 36bc332b4d2484ff57931a942c5bbe30 , Show latest

From 8b2933d7bdc2d410691fbc5a39a74a02166610c6 Mon Sep 17 00:00:00 2001
From: Daniel Hoffend <dh@dotlan.net>
Date: Sun, 14 Sep 2014 02:18:04 +0200
Subject: [PATCH] fixed import of roundcube mysql.initial.sql

---
 pykolab/setup/setup_roundcube.py |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pykolab/setup/setup_roundcube.py b/pykolab/setup/setup_roundcube.py
index 259f676..ab73861 100644
--- a/pykolab/setup/setup_roundcube.py
+++ b/pykolab/setup/setup_roundcube.py
@@ -140,12 +140,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)

--
1.7.10.4