Gentoo Archives: gentoo-commits

From: "Robin H. Johnson (robbat2)" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-util/git/files: 20090305-git-1.6.2-noperl.patch
Date: Fri, 03 Apr 2009 06:12:35
Message-Id: E1Lpcdl-0007EC-W9@stork.gentoo.org
1 robbat2 09/04/03 06:12:33
2
3 Modified: 20090305-git-1.6.2-noperl.patch
4 Log:
5 Fix testsuite functionality with USE=-perl, the add-interactive test uses perl and was not excluded.
6 (Portage version: 2.2_rc27/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.2 dev-util/git/files/20090305-git-1.6.2-noperl.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/files/20090305-git-1.6.2-noperl.patch?rev=1.2&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/files/20090305-git-1.6.2-noperl.patch?rev=1.2&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/git/files/20090305-git-1.6.2-noperl.patch?r1=1.1&r2=1.2
14
15 Index: 20090305-git-1.6.2-noperl.patch
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/dev-util/git/files/20090305-git-1.6.2-noperl.patch,v
18 retrieving revision 1.1
19 retrieving revision 1.2
20 diff -p -w -b -B -u -u -r1.1 -r1.2
21 --- 20090305-git-1.6.2-noperl.patch 6 Mar 2009 06:59:03 -0000 1.1
22 +++ 20090305-git-1.6.2-noperl.patch 3 Apr 2009 06:12:33 -0000 1.2
23 @@ -15,6 +15,8 @@ Notes: Ported from 20080322-git-1.5.4.5-
24 Notes: Ported from 20080528-git-1.5.6.1-noperl.patch
25 Notes: Ported from 20080626-git-1.5.6.1-noperl.patch and 20081123-git-1.6.0.4-noperl-cvsserver.patch
26 Notes: Ported from 20090126-git-1.6.1.1-noperl.patch
27 +Notes: t3701-add-interactive.sh block added 2009/04/02 as it was missed, broke
28 + testsuite with USE=-perl.
29
30 diff --git a/Makefile b/Makefile
31 index 0675c43..0adb2b5 100644
32 @@ -368,3 +370,19 @@ index d2379e7..75bf178 100755
33
34 cvsps_version=`cvsps -h 2>&1 | sed -ne 's/cvsps version //p'`
35 case "$cvsps_version" in
36 +--- git-1.6.2.2.orig/t/t3701-add-interactive.sh 2009-04-02 14:26:45.000000000 -0700
37 ++++ git-1.6.2.2/t/t3701-add-interactive.sh 2009-04-02 23:06:20.543358154 -0700
38 +@@ -3,6 +3,13 @@
39 + test_description='add -i basic tests'
40 + . ./test-lib.sh
41 +
42 ++if test -n "$NO_PERL"
43 ++then
44 ++ test_expect_success 'skipping add-interactive tests, NO_PERL defined' :
45 ++ test_done
46 ++ exit
47 ++fi
48 ++
49 + test_expect_success 'setup (initial)' '
50 + echo content >file &&
51 + git add file &&