Marc Abramowitz <msabr...@gmail.com> added the comment: The 2.7 patch doesn't apply cleanly for me against the latest on the 2.7 branch:
[last: 0] marca@scml-marca:~/src$ hg clone http://hg.python.org/cpython && cd cpython && hg update 2.7 && hg branch && hg tip && curl -s http://bugs.python.org/file25192/aa2dcffa267f.diff | patch -p1 destination directory: cpython requesting all changes adding changesets adding manifests adding file changes added 77379 changesets with 172430 changes to 9646 files (+1 heads) updating to branch default 3917 files updated, 0 files merged, 0 files removed, 0 files unresolved 3574 files updated, 0 files merged, 945 files removed, 0 files unresolved 2.7 changeset: 77378:da5b370f41a1 branch: 2.7 tag: tip user: Richard Oudkerk <shibt...@gmail.com> date: Wed Jun 06 19:01:14 2012 +0100 summary: Issue #13854: Properly handle non-integer, non-string arg to SystemExit patching file .hgignore patching file Doc/library/debug.rst patching file Doc/library/dtrace.rst patching file Include/code.h patching file Include/pydtrace.d patching file Include/pydtrace.h patching file Include/pydtrace_offsets.c patching file Include/pydtrace_offsets.sh patching file Lib/test/dtrace_sample.py patching file Lib/test/test_dtrace.py patching file Makefile.pre.in patching file Modules/dtracemodule.c patching file Modules/gcmodule.c Hunk #2 succeeded at 873 (offset 51 lines). Hunk #3 succeeded at 1038 (offset 54 lines). patching file Objects/classobject.c Hunk #2 succeeded at 557 (offset 10 lines). Hunk #3 succeeded at 622 (offset 10 lines). Hunk #4 succeeded at 676 (offset 10 lines). Hunk #5 succeeded at 758 (offset 10 lines). patching file Objects/codeobject.c patching file Objects/typeobject.c Hunk #4 succeeded at 931 (offset 5 lines). patching file Python/ceval.c patching file Python/sysmodule.c patching file configure Hunk #1 succeeded at 619 (offset 8 lines). Hunk #2 succeeded at 768 (offset 8 lines). Hunk #3 succeeded at 1444 (offset 8 lines). Hunk #4 FAILED at 2616. Hunk #5 FAILED at 3548. Hunk #6 FAILED at 3663. Hunk #7 FAILED at 3706. Hunk #8 FAILED at 3765. Hunk #9 FAILED at 3817. Hunk #10 FAILED at 4360. Hunk #11 FAILED at 6713. Hunk #12 FAILED at 6746. Hunk #13 FAILED at 6779. Hunk #14 FAILED at 6812. Hunk #15 FAILED at 6845. Hunk #16 FAILED at 6878. Hunk #17 FAILED at 6911. Hunk #18 FAILED at 6944. Hunk #19 FAILED at 6977. Hunk #20 FAILED at 7037. Hunk #21 FAILED at 7098. Hunk #22 FAILED at 7159. Hunk #23 FAILED at 7207. Hunk #24 FAILED at 7248. Hunk #25 FAILED at 7310. Hunk #26 FAILED at 7381. Hunk #27 succeeded at 9464 (offset 8 lines). Hunk #28 FAILED at 12456. Hunk #29 FAILED at 12508. Hunk #30 FAILED at 12627. Hunk #31 FAILED at 12893. Hunk #32 FAILED at 14693. Hunk #33 FAILED at 15008. Hunk #34 FAILED at 15036. Hunk #35 FAILED at 15063. 31 out of 35 hunks FAILED -- saving rejects to file configure.rej can't find file to patch at input line 2128 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -r 70274d53c1dd -r aa2dcffa267f configure.in |--- a/configure.in Mon Apr 09 19:04:04 2012 -0400 |+++ b/configure.in Thu Apr 12 12:51:51 2012 +0200 -------------------------- File to patch: ---------- _______________________________________ Python tracker <rep...@bugs.python.org> <http://bugs.python.org/issue13405> _______________________________________ _______________________________________________ Python-bugs-list mailing list Unsubscribe: http://mail.python.org/mailman/options/python-bugs-list/archive%40mail-archive.com
