File pykolab-0.7.11-setup_roundcubedir.patch of Package pykolab

Overview Repositories Revisions Requests Users Attributes Meta

File pykolab-0.7.11-setup_roundcubedir.patch of Package pykolab (Revision 5d8439a61618bb8a8a57b806ab11c950)

Currently displaying revision 5d8439a61618bb8a8a57b806ab11c950 , Show latest

diff -Ppru pykolab-0.7.11.orig/pykolab/setup/setup_roundcube.py pykolab-0.7.11_setup_roundcubedir/pykolab/setup/setup_roundcube.py
--- pykolab-0.7.11.orig/pykolab/setup/setup_roundcube.py	2015-03-27 15:24:53.000000000 +0100
+++ pykolab-0.7.11_setup_roundcubedir/pykolab/setup/setup_roundcube.py	2015-04-01 10:03:23.310491925 +0200
@@ -44,6 +44,16 @@ def description():
     return _("Setup Roundcube.")
 
 def execute(*args, **kw):
+    if os.path.isdir('/usr/share/roundcubemail'):
+        rcpath = '/usr/share/roundcubemail/'
+    elif os.path.isdir('/usr/share/roundcube'):
+        rcpath = '/usr/share/roundcube/'
+    elif os.path.isdir('/srv/www/roundcubemail'):
+        rcpath = '/srv/www/roundcubemail/'
+    else:
+        log.error(_("Roundcube installation path not found."))
+        return
+
     print >> sys.stderr, utils.multiline_message(
             _("""
                     Please supply a password for the MySQL user 'roundcube'.
@@ -88,9 +98,9 @@ def execute(*args, **kw):
             'conf': conf
         }
 
-    if os.access('/usr/share/roundcubemail/skins/enterprise/', os.R_OK):
+    if os.access(rcpath + 'skins/enterprise/', os.R_OK):
         rc_settings['skin'] = 'enterprise'
-    elif os.access('/usr/share/roundcubemail/skins/chameleon/', os.R_OK):
+    elif os.access(rcpath + 'skins/chameleon/', os.R_OK):
         rc_settings['skin'] = 'chameleon'
     else:
         rc_settings['skin'] = 'larry'
@@ -160,14 +170,6 @@ def execute(*args, **kw):
                     break
         break
 
-    if os.path.isdir('/usr/share/roundcubemail'):
-        rcpath = '/usr/share/roundcubemail/'
-    elif os.path.isdir('/usr/share/roundcube'):
-        rcpath = '/usr/share/roundcube/'
-    else:
-        log.error(_("Roundcube installation path not found."))
-        return
-
     for root, directories, filenames in os.walk(rcpath + 'plugins/calendar/drivers/kolab/'):
         for filename in filenames:
             if filename.startswith('mysql') and filename.endswith('.sql'):

Places

File pykolab-0.7.11-setup_roundcubedir.patch of Package pykolab (Revision 5d8439a61618bb8a8a57b806ab11c950)

Places