Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: cvs.eclass
Date: Wed, 25 Aug 2010 19:57:59
Message-Id: 20100825195753.5DB9B2004E@flycatcher.gentoo.org
1 vapier 10/08/25 19:57:53
2
3 Modified: cvs.eclass
4 Log:
5 fix order of ECVS_CVS_COMMAND and its default options #334241 by Michał Górny
6
7 Revision Changes Path
8 1.76 eclass/cvs.eclass
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cvs.eclass?rev=1.76&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cvs.eclass?rev=1.76&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cvs.eclass?r1=1.75&r2=1.76
13
14 Index: cvs.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v
17 retrieving revision 1.75
18 retrieving revision 1.76
19 diff -u -r1.75 -r1.76
20 --- cvs.eclass 24 Aug 2010 21:00:15 -0000 1.75
21 +++ cvs.eclass 25 Aug 2010 19:57:53 -0000 1.76
22 @@ -1,6 +1,6 @@
23 -# Copyright 1999-2008 Gentoo Foundation
24 +# Copyright 1999-2010 Gentoo Foundation
25 # Distributed under the terms of the GNU General Public License v2
26 -# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.75 2010/08/24 21:00:15 vapier Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.76 2010/08/25 19:57:53 vapier Exp $
28
29 # @ECLASS: cvs.eclass
30 # @MAINTAINER:
31 @@ -27,6 +27,18 @@
32 # this eclass will take care of that. If you want to set the global
33 # KDE cvs ebuilds' settings, see the comments in kde-source.eclass.
34
35 +# @ECLASS-VARIABLE: ECVS_CVS_COMPRESS
36 +# @DESCRIPTION:
37 +# Set the default compression level. Has no effect when ECVS_CVS_COMMAND
38 +# is defined by ebuild/user.
39 +: ${ECVS_CVS_COMPRESS:=-z1}
40 +
41 +# @ECLASS-VARIABLE: ECVS_CVS_OPTIONS
42 +# @DESCRIPTION:
43 +# Additional options to the cvs commands. Has no effect when ECVS_CVS_COMMAND
44 +# is defined by ebuild/user.
45 +: ${ECVS_CVS_OPTIONS:=-q -f}
46 +
47 # @ECLASS-VARIABLE: ECVS_CVS_COMMAND
48 # @DESCRIPTION:
49 # CVS command to run
50 @@ -35,28 +47,18 @@
51 # on the cvs connection. The default of "cvs -q -f -z4" means to be
52 # quiet, to disregard the ~/.cvsrc config file and to use maximum
53 # compression.
54 -[[ -z ${ECVS_CVS_COMMAND} ]] && ECVS_CVS_COMMAND="cvs ${ECVS_CVS_OPTIONS} ${ECVS_CVS_COMPRESS}"
55 -
56 -# @ECLASS-VARIABLE: ECVS_CVS_COMPRESS
57 -# @DESCRIPTION:
58 -# Set the compression level.
59 -[[ -z ${ECVS_CVS_COMPRESS} ]] && ECVS_CVS_COMPRESS="-z1"
60 -
61 -# @ECLASS-VARIABLE: ECVS_CVS_OPTIONS
62 -# @DESCRIPTION:
63 -# Additional options to the cvs commands.
64 -[[ -z ${ECVS_CVS_OPTIONS} ]] && ECVS_CVS_OPTIONS="-q -f"
65 +: ${ECVS_CVS_COMMAND:=cvs ${ECVS_CVS_OPTIONS} ${ECVS_CVS_COMPRESS}}
66
67 # @ECLASS-VARIABLE: ECVS_UP_OPTS
68 # @DESCRIPTION:
69 # CVS options given after the cvs update command. Don't remove "-dP" or things
70 # won't work.
71 -[ -z "$ECVS_UP_OPTS" ] && ECVS_UP_OPTS="-dP"
72 +: ${ECVS_UP_OPTS:=-dP}
73
74 # @ECLASS-VARIABLE: ECVS_CO_OPTS
75 +# @DEFAULT_UNSET
76 # @DESCRIPTION:
77 # CVS options given after the cvs checkout command.
78 -[ -z "$ECVS_CO_OPTS" ] && ECVS_CO_OPTS=""
79
80 # @ECLASS-VARIABLE: ECVS_OFFLINE
81 # @DESCRIPTION: