cherokee at cherokee-project
Feb 6, 2010, 6:31 AM
Post #1 of 1
(119 views)
Permalink
|
|
[4208] cherokee/trunk/admin/Wizard_Symfony.py: Addresses issue 716.
|
|
Revision: 4208
http://svn.cherokee-project.com/changeset/4208
Author: taher
Date: 2010-02-06 15:31:41 +0100 (Sat, 06 Feb 2010)
Log Message:
-----------
Addresses issue 716. Symfony paths had changed
Modified Paths:
--------------
cherokee/trunk/admin/Wizard_Symfony.py
Modified: cherokee/trunk/admin/Wizard_Symfony.py
===================================================================
--- cherokee/trunk/admin/Wizard_Symfony.py 2010-01-29 23:18:21 UTC (rev 4207)
+++ cherokee/trunk/admin/Wizard_Symfony.py 2010-02-06 14:31:41 UTC (rev 4208)
@@ -2,6 +2,9 @@
Symfony wizard. Checked with:
* Cherokee 0.99.25
* Symfony 1.2.9
+
+* Cherokee 0.99.44
+* Symfony 1.2.10, 1.3.1, 1.4.1
"""
import validations
from config import *
@@ -79,19 +82,29 @@
"""
SRC_PATHS = [.
- "/usr/share/php/data/symfony1.0", # Debian, Fedora
+ "/usr/share/php/data/symfony1.4", # Debian, Fedora
+ "/usr/share/php/data/symfony1.3",
"/usr/share/php/data/symfony1.2",
+ "/usr/share/php/data/symfony1.0",
"/usr/share/php/data/symfony",
- "/usr/local/lib/php/data/symfony" # Pear installation
+ "/usr/local/lib/php/data/symfony", # Pear installation
+ "/usr/share/pear/data/symfony",
+ "/usr/share/pear/symfony",
]
def is_symfony_dir (path, cfg, nochroot):
path = validations.is_local_dir_exists (path, cfg, nochroot)
- module_inc = os.path.join (path, 'bin/symfony.php')
- if not os.path.exists (module_inc):
- raise ValueError, _(ERROR_NO_SRC)
- return path
+ module_inc = os.path.join (path, 'bin/symfony')
+ if os.path.exists (module_inc):
+ return path
+
+ module_inc = os.path.join (path, 'bin/check_configuration.php')
+ if os.path.exists (module_inc):
+ return path
+
+ raise ValueError, _(ERROR_NO_SRC)
+
DATA_VALIDATION = [
("tmp!wizard_symfony!sources", (is_symfony_dir, 'cfg')),
("tmp!wizard_symfony!host", (validations.is_new_host, 'cfg')),
|
