equal
deleted
inserted
replaced
|
1 In-house developed patch. |
|
2 Patch to overall Cheetah test framework to find the correct version of |
|
3 Python to use based on the $PYTHON_VERSION environment variable. |
|
4 Solaris-specific; not suitable for upstream |
|
5 |
|
6 --- Cheetah-2.4.4/cheetah/Tests/CheetahWrapper.py.orig Thu Sep 16 12:21:36 2010 |
|
7 +++ Cheetah-2.4.4/cheetah/Tests/CheetahWrapper.py Sun Sep 1 01:27:50 2013 |
|
8 @@ -63,7 +63,11 @@ |
|
9 """Create the top-level directories, subdirectories and .tmpl |
|
10 files. |
|
11 """ |
|
12 - self.cmd = self.locate_cheetah('cheetah') |
|
13 + if not os.environ.get('PYTHON_VERSION'): |
|
14 + self.cmd = self.locate_cheetah('cheetah') |
|
15 + else: |
|
16 + self.cmd = self.locate_cheetah( |
|
17 + ''.join(['cheetah-', os.environ['PYTHON_VERSION']])) |
|
18 pythonPath = os.getcwd() |
|
19 if not os.environ.get('PYTHONPATH'): |
|
20 os.environ['PYTHONPATH'] = pythonPath |