Changeset 4063

Show
Ignore:
Timestamp:
07/26/08 02:55:23 (6 months ago)
Author:
progrium
Message:

this corrects a problem in that last revision where the patch came from a version that was incorrectly patched from before. follow? it works now... actually tested

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • subprojectspatch/0.11/sub-projects.diff

    r4053 r4063  
    1 Index: trac/web/main.py 
    2 =================================================================== 
    3 --- trac/web/main.py    (revision 7355) 
    4 +++ trac/web/main.py    (working copy) 
    5 @@ -342,6 +342,19 @@ 
    6          env_paths = environ.get('trac.env_paths') 
    7          if env_parent_dir or env_paths: 
    8              # The first component of the path is the base name of the 
    9 +            path_info = environ.get('PATH_INFO') 
     1diff -r cf8531ae211a trac/web/main.py 
     2--- a/trac/web/main.py  Mon Jul 21 01:44:40 2008 -0700 
     3+++ b/trac/web/main.py  Sat Jul 26 00:50:24 2008 -0700 
     4@@ -345,6 +345,18 @@ 
     5             # environment 
     6             path_info = environ.get('PATH_INFO', '').lstrip('/').split('/') 
     7             env_name = path_info.pop(0) 
     8+             
    109+            if len(path_info) and path_info[0] == 'p': 
    1110+                path_info.pop(0) # pop off the p 
    …… 
    1918+            else: 
    2019+                parent_env = None 
    21 + 
    22              # environment 
    23              path_info = environ.get('PATH_INFO', '').lstrip('/').split('/') 
    24              env_name = path_info.pop(0) 
    25 @@ -356,7 +369,10 @@ 
     20  
     21             if not env_name: 
     22                 # No specific environment requested, so render an environment 
     23@@ -356,7 +368,10 @@ 
    2624             # To make the matching patterns of request handlers work, we append 
    2725             # the environment name to the `SCRIPT_NAME` variable, and keep only