Gentoo Archives: gentoo-commits

From: "Brian Harring (ferringb)" <ferringb@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-python/snakeoil/files: snakeoil-issue-7567-term-invocation.patch
Date: Tue, 04 Jan 2011 20:48:37
Message-Id: 20110104204827.26A6D2005E@flycatcher.gentoo.org
1 ferringb 11/01/04 20:48:27
2
3 Modified: snakeoil-issue-7567-term-invocation.patch
4 Log:
5 refresh the patch to disable terminfo tests for 2.7; #350215
6
7 (Portage version: 2.2.0_alpha3/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.2 dev-python/snakeoil/files/snakeoil-issue-7567-term-invocation.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/snakeoil/files/snakeoil-issue-7567-term-invocation.patch?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/snakeoil/files/snakeoil-issue-7567-term-invocation.patch?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/snakeoil/files/snakeoil-issue-7567-term-invocation.patch?r1=1.1&r2=1.2
15
16 Index: snakeoil-issue-7567-term-invocation.patch
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-python/snakeoil/files/snakeoil-issue-7567-term-invocation.patch,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- snakeoil-issue-7567-term-invocation.patch 3 Jan 2011 11:14:08 -0000 1.1
23 +++ snakeoil-issue-7567-term-invocation.patch 4 Jan 2011 20:48:27 -0000 1.2
24 @@ -15,7 +15,7 @@
25 mk_tempfile = tempfile.TemporaryFile
26
27 +sys_ver = sys.version_info[:3]
28 -+if (sys_ver >= (2,6,6) and sys_ver < (2,7)) or sys_ver >= (3,2,0):
29 ++if (sys_ver >= (2,6,6) and sys_ver < (2,8)) or sys_ver >= (3,2,0):
30 + def issue7567(functor):
31 + functor.skip = "issue 7567 patch breaks multiple term invocations, disabled till it's sorted"
32 + return functor
33 @@ -36,7 +36,7 @@
34 formatters.TerminfoHatesOurTerminal,
35 formatters.TerminfoFormatter, stream, term='dumb')
36
37 -+ if sys_ver >= (2,6,6) and sys_ver < (2,7):
38 ++ if sys_ver >= (2,6,6) and sys_ver < (2,8):
39 + test_terminfo_hates_term.skip = "issue doesn't exist for 2.6.6 till 2.7"
40 +