Graham Dumpleton
grahamd at dscpl.com.au
Tue Apr 26 23:11:52 EDT 2005
Damjan wrote .. > > I have put all the code changes together under the bug report: > > > > http://issues.apache.org/jira/browse/MODPYTHON-48 > > > > Links have been included back to some of the mailing list > > messages for context. > > > > If this doesn't solve everything let us know. > > Aren't *unified* diff's the norm ussually? ... I have some problems > applying your patch: > $ patch -p2 < ~/psp.diff > patching file lib/python/mod_python/psp.py > missing header for context diff at line 54 of patch > patching file src/_pspmodule.c I used context diff because I feel it is easier for a person who is manually trying to incorporate changes to see the difference. I would suggest that you are a very rare person in as much as you actually know what the "patch" program is. ;-) Anyway, I can't explain why it isn't working. Even when I generate a unified diff for that file in a distinct file, patch still dies. /usr/local/src/mod_python-3.1.3 [597]$ patch -p2 --dry-run < ~/psp-3.diff missing header for unified diff at line 3 of patch patching file src/_pspmodule.c The unified diff it you want to try it is: --- ../mod_python-3.1.3/src/_pspmodule.c Tue Feb 17 06:47:27 2004 +++ src/_pspmodule.c Wed Apr 27 10:43:51 2005 @@ -146,7 +146,7 @@ bs = yy_scan_string(PyString_AsString(str), scanner); yylex(scanner); - yy_delete_buffer(bs, scanner); + /* yy_delete_buffer(bs, scanner); */ yylex_destroy(scanner); psp_string_0(&parser->pycode);
|