/[gentoo-x86]/eclass/cvs.eclass
Gentoo

Diff of /eclass/cvs.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.6 Revision 1.49
1# Copyright 1999-2000 Gentoo Technologies, Inc. 1# Copyright 1999-2003 Gentoo Technologies, Inc.
2# Distributed under the terms of the GNU General Public License, v2 or later 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.49 2003/09/28 17:24:18 coredumb Exp $
4#
5# Current Maintainer: Tal Peer <coredumb@gentoo.org>
3# Author Dan Armak <danarmak@gentoo.org> 6# Original Author: Dan Armak <danarmak@gentoo.org>
4# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.6 2002/08/01 19:16:31 danarmak Exp $ 7#
8# SSH auth code by Danny <danny.milo@gmx.net>
9#
5# This eclass provides the generic cvs fetching functions. 10# This eclass provides the generic cvs fetching functions.
11# to use from an ebuild, set the 'ebuild-configurable settings' below in your ebuild before inheriting.
12# then either leave the default src_unpack or extend over cvs_src_unpack.
13# if you find that you need to call the cvs_* functions directly, i'd be interested to hear about it.
14
15# TODO:
16# Implement more auth types (gserver?, kserver?)
17# Implement more 'ext' auth methods (do anyone actually use it with anything other than ssh?)
18# Add support for password-based ssh (only keys supported now)
6 19
7ECLASS=cvs 20ECLASS=cvs
8INHERITED="$INHERITED $ECLASS" 21INHERITED="$INHERITED $ECLASS"
9 22
10# You shouldn't change these settings yourself! The ebuild/eclass inheriting this eclass 23# You shouldn't change these settings yourself! The ebuild/eclass inheriting this eclass
14# --- begin ebuild-configurable settings 27# --- begin ebuild-configurable settings
15 28
16# cvs command to run. you can set fex. "cvs -t" for extensive debug information 29# cvs command to run. you can set fex. "cvs -t" for extensive debug information
17# on the cvs onnection. the default of "cvs -q -f -z4" means to be quiet, to disregard 30# on the cvs onnection. the default of "cvs -q -f -z4" means to be quiet, to disregard
18# the ~/.cvsrc config file and to use maximum compression. 31# the ~/.cvsrc config file and to use maximum compression.
19[ -z "$ECVS_CVS_COMMAND" ] && ECVS_CVS_COMMAND="cvs -f -z4" 32[ -z "$ECVS_CVS_COMMAND" ] && ECVS_CVS_COMMAND="cvs -q -f -z4"
33
34# cvs options given after the cvs command (update or checkout)
35# don't remove -dP from update or things won't work
36[ -z "$ECVS_UP_OPTS" ] && ECVS_UP_OPTS="-dP"
37[ -z "$ECVS_CO_OPTS" ] && ECVS_CO_OPTS=""
38
39# set this to some value for the module/subdir to be fetched non-recursively: ECVS_LOCAL
40
41# local name of module. useful if the module on the server is called
42# something common like 'driver' or is nested deep in a tree, and you don't
43# like useless empty directories.
44# WARNING: to be set only from within ebuilds! if set in your shell or some such,
45# things wil break because the ebuild won't expect it and have e.g. a wrong $S setting.
46# ECVS_LOCALNAME
20 47
21# Where the cvs modules are stored/accessed 48# Where the cvs modules are stored/accessed
22[ -z "$ECVS_TOP_DIR" ] && ECVS_TOP_DIR="/usr/src" 49[ -z "$ECVS_TOP_DIR" ] && ECVS_TOP_DIR="${DISTDIR}/cvs-src"
23 50
24# Name of cvs server, set to "" to disable fetching 51# Name of cvs server, set to "offline" to disable fetching
25# (i.e. to assume module is checked out already and don't update it). 52# (i.e. to assume module is checked out already and don't update it).
26# Format is server:/dir e.g. "anoncvs.kde.org:/home/kde". remove the other 53# Format is server:/dir e.g. "anoncvs.kde.org:/home/kde". remove the other
27# parts of the full CVSROOT (which looks like 54# parts of the full CVSROOT (which looks like
28# ":pserver:anonymous@anoncvs.kde.org:/home/kde"); these are added from 55# ":pserver:anonymous@anoncvs.kde.org:/home/kde"); these are added from
29# other settings 56# other settings
57# the special value 'offline' disables fetching, assumes sources are alread in ECVS_TOP_DIR
30[ -z "$ECVS_SERVER" ] && ECVS_SERVER="" 58[ -z "$ECVS_SERVER" ] && ECVS_SERVER="offline"
31 59
32# Username to use 60# Authentication method to use - possible values are "pserver" and "ext"
61# Currently, only method for 'ext' is ssh, please note that it doesn't
62# work with passwords, only with keys.
63[ -z "$ECVS_AUTH" ] && ECVS_AUTH="pserver"
64
65# Use su to run cvs as user
66# Currently b0rked and wouldn't work with portage userpriv anyway without special magic
67# [ -z "$ECVS_RUNAS" ] && ECVS_RUNAS="`whoami`"
68
69# Username to give to the server
33[ -z "$ECVS_USER" ] && ECVS_USER="anonymous" 70[ -z "$ECVS_USER" ] && ECVS_USER="anonymous"
34 71
35# Password to use (NOT (YET) SUPPORTED, because cvs doesn't store passwords in plaintext in .cvspass) 72# Password to use
36[ -z "$ECVS_PASS" ] && ECVS_PASS="" 73[ -z "$ECVS_PASS" ] && ECVS_PASS=""
37 74
38# Module to be fetched, must be set explicitly - 75# Module to be fetched, must be set when kde_src_unpack is called
39# I don't like the former ="$NP" default setting 76# can include several directory levels, ie foo/bar/baz
40[ -z "$ECVS_MODULE" ] && die "$ECLASS: error: ECVS_MODULE not set, cannot continue" 77#[ -z "$ECVS_MODULE" ] && die "$ECLASS: error: ECVS_MODULE not set, cannot continue"
41 78
42# Subdirectory in module to be fetched, default is not defined = whole module 79# Branch/tag to use, default is HEAD
43# DO NOT set default to "", if it's defined at all code will break! 80# the following default _will_ reset your branch checkout to head if used
44# don't uncomment following line! 81#[ -z "$ECVS_BRANCH" ] && ECVS_BRANCH="HEAD"
45#[ -z "$ECVS_MODULE_SUBDIR" ] && ECVS_MODULE_SUBDIR="" 82
83# deprecated - do not use
84[ -n "$ECVS_SUBDIR" ] && die "ERROR: deprecated ECVS_SUBDIR defined. Please fix this ebuild."
85
86# ECVS_CLEAN: set this to something to get a clean copy when updating (passes the -C option to cvs update)
46 87
47# --- end ebuild-configurable settings --- 88# --- end ebuild-configurable settings ---
48 89
49# add cvs to deps 90# add cvs to deps
91# ssh is used for ext auth
92# sudo is used to run as a specified user
50DEPEND="$DEPEND dev-util/cvs" 93DEPEND="$DEPEND dev-util/cvs app-admin/sudo"
51 94
52# since we now longer have src_fetch as a redefinable ebuild function, 95if [ "$ECVS_AUTH" == "ext" ]; then
53# we are forced to call this function from cvs_src_unpack 96 #default to ssh
97 [ -z "$CVS_RSH" ] && export SSH_RSH="ssh"
98 if [ "$CVS_RSH" != "ssh" ]; then
99 die "Support for ext auth with clients other than ssh has not been implemented yet"
100 fi
101 DEPEND="$DEPEND net-misc/openssh"
102fi
103
104# calls cvs_contorl, is called from cvs_src_unpack
54cvs_fetch() { 105cvs_fetch() {
55 106
107 # fix for sourceforge which doesnt want -z>3 anymore.
108
109 (echo $ECVS_SERVER | grep sourceforge) && [ "$ECVS_CVS_COMMAND" == "cvs -q -f -z4" ] && ECVS_CVS_COMMAND="cvs -q -f -z3"
110
56 debug-print-function $FUNCNAME $* 111 debug-print-function $FUNCNAME $*
57 112
58 debug-print "$FUNCNAME: init: 113 # parameters modifying other parameters that should be effective every time cvs_fetch is called,
59ECVS_CVS_COMMAND=$ECVS_CVS_COMMAND 114 # and not just every time cvs.eclas is inherited
60ECVS_TOP_DIR=$ECVS_TOP_DIR 115 # 1. parameter for local (non-recursive) fetching
61ECVS_SERVER=$ECVS_SERVER 116 if [ -n "$ECVS_LOCAL" ]; then
62ECVS_USER=$ECVS_USER 117 ECVS_UP_OPTS="$ECVS_UP_OPTS -l"
63ECVS_PASS=$ECVS_PASS 118 ECVS_CO_OPTS="$ECVS_CO_OPTS -l"
64ECS_MODULE=$ECVS_MODULE 119 fi
65ECVS_MODULE_SUBDIR=$ECVS_SUBDIR 120 # 2. cvs auto-switches branches, we just have to pass the correct -rBRANCH option to it when updating.
66DIR=$DIR" 121 # doing it this way we get multiple -rX options - harmless afaik
67 122 if [ -n "$ECVS_BRANCH" ]; then
68 # a shorthand 123 ECVS_UP_OPTS="$ECVS_UP_OPTS -r$ECVS_BRANCH"
69 [ -n "$ECVS_SUBDIR" ] && DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}/${ECVS_SUBDIR}" || \ 124 ECVS_CO_OPTS="$ECVS_CO_OPTS -r$ECVS_BRANCH"
70 DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}" 125 fi
71 126
72 addread $DIR 127 if [ "$ECVS_LOCALNAME" != "$ECVS_MODULE" ]; then
73 128 # the option to cvs on which this is based. note this isn't the same as the
129 # global -d option to cvs, which specifies the cvs server. ugh @ cvs syntax.
130 ECVS_CO_OPTS="$ECVS_CO_OPTS -d $ECVS_LOCALNAME"
131 fi
132
133 if [ -n "$ECVS_CLEAN" ]; then
134 ECVS_UP_OPTS="$ECVS_UP_OPTS -C"
135 fi
136
137 # it's easiest to always be in "run-as mode", logic-wise
138 # or would be if sudo didn't ask for a password even when sudo'ing to `whoami`
74 if [ -z "$ECVS_SERVER" ]; then 139 if [ -z "$ECVS_RUNAS" ]; then
75 # we're not required to fetch anything, the module already exists and shouldn't be updated 140 run=""
141 else
142 run="sudo -u $ECVS_RUNAS"
143 fi
144
145 # create the top dir if needed
76 if [ -d "$DIR" ]; then 146 if [ ! -d "$ECVS_TOP_DIR" ]; then
77 debug-print "$FUNCNAME: offline mode, exiting" 147 # note that the addwrite statements in this block are only there to allow creating ECVS_TOP_DIR;
78 return 0 148 # we've already allowed writing inside it
79 else 149 # this is because it's simpler than trying to find out the parent path of the directory, which
80 einfo "ERROR: Offline mode specified, but module/subdir not found. Aborting." 150 # would need to be the real path and not a symlink for things to work (so we can't just remove
81 debug-print "$FUNCNAME: offline mode specified but module/subdir not found, exiting with error" 151 # the last path element in the string)
82 return 1 152 debug-print "$FUNCNAME: checkout mode. creating cvs directory"
83 fi 153 addwrite /foobar
154 addwrite /
155 $run mkdir -p "/$ECVS_TOP_DIR"
156 export SANDBOX_WRITE="${SANDBOX_WRITE//:\/foobar:\/}"
157 fi
158
159 # in case ECVS_TOP_DIR is a symlink to a dir, get the real dir's path,
160 # otherwise addwrite() doesn't work.
161 cd -P "$ECVS_TOP_DIR" > /dev/null
162 ECVS_TOP_DIR="`/bin/pwd`"
163
164 # determine checkout or update mode
165 if [ ! -d "$ECVS_TOP_DIR/$ECVS_LOCALNAME/CVS" ]; then
166 mode=checkout
167 else
168 mode=update
84 fi 169 fi
85 170
86 # disable the sandbox for this dir 171 # disable the sandbox for this dir
87
88 # not just $DIR because we want to create moduletopdir/CVS too
89 addwrite $ECVS_TOP_DIR/$ECVS_MODULE 172 addwrite "$ECVS_TOP_DIR"
90
91 if [ ! -d "$DIR" ]; then
92 debug-print "$FUNCNAME: creating cvs directory $DIR"
93 einfo "Creating directory $DIR"
94 mkdir -p /$DIR
95 fi
96 173
97 # prepare a cvspass file just for this session so that cvs thinks we're logged 174 # chowning the directory and all contents
98 # in at the cvs server. we don't want to mess with ~/.cvspass.
99 echo ":pserver:${ECVS_SERVER} A" > ${T}/cvspass
100 export CVS_PASSFILE="${T}/cvspass"
101 #export CVSROOT=:pserver:${ECVS_USER}@${ECVS_SERVER}
102
103 # Note: cvs update and checkout commands are unified.
104 # we make sure a CVS/ dir exists in our module subdir with the right
105 # Root and Repository entries in it and cvs update.
106
107 newserver=":pserver:anonymous@${ECVS_SERVER}"
108
109 # CVS/Repository files can't (I think) contain two concatenated slashes
110 if [ -n "$ECVS_SUBDIR" ]; then 175 if [ -n "$ECVS_RUNAS" ]; then
111 repository="${ECVS_MODULE}/${ECVS_SUBDIR}" 176 $run chown -R "$ECVS_RUNAS" "/$ECVS_TOP_DIR"
112 else
113 repository="${ECVS_MODULE}"
114 fi
115
116 debug-print "$FUNCNAME: Root<-$newserver, Repository<-$repository"
117
118 cd $DIR
119 if [ ! -d "$DIR/CVS" ]; then
120 # create a new CVS/ directory (checkout)
121 debug-print "$FUNCNAME: creating new cvs directory"
122
123 mkdir CVS
124 echo $newserver > CVS/Root
125 echo $repository > CVS/Repository
126 touch CVS/Entries
127
128 # if we're checking out a subdirectory only, create a CVS/ dir
129 # in the module's top dir so that the user (and we) can cvs update
130 # from there to get the full module.
131 if [ ! -d "$ECVS_TOP_DIR/$ECVS_MODULE/CVS" ]; then
132 debug-print "$FUNCNAME: Copying CVS/ directory to module top-level dir"
133 cp -r CVS $ECVS_TOP_DIR/$ECVS_MODULE/
134 echo $ECVS_MODULE > $ECVS_TOP_DIR/$ECVS_MODULE/CVS/Repository
135 fi 177 fi
136 178
137 else 179 # our server string (aka CVSROOT), without the password so it can be put in Root
138 #update existing module 180 server=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}"
139 debug-print "$FUNCNAME: updating existing module/subdir" 181
140
141 # Switch servers if needed 182 # switch servers automagically if needed
142 # cvs keeps the server info in the CVS/Root file in every checked-out dir; 183 if [ "$mode" == "update" ]; then
143 # we can fix those files to point to the new server 184 cd /$ECVS_TOP_DIR/$ECVS_LOCALNAME
144 oldserver="`cat CVS/Root`" 185 oldserver="`$run cat CVS/Root`"
145 if [ "$newserver" != "$oldserver" ]; then 186 if [ "$server" != "$oldserver" ]; then
146 187
147 einfo "Changing CVS server from $oldserver to $newserver:" 188 einfo "Changing CVS server from $oldserver to $server:"
148 debug-print "$FUNCNAME: Changing CVS server from $oldserver to $newserver:" 189 debug-print "$FUNCNAME: Changing CVS server from $oldserver to $server:"
149 190
150 einfo "Searching for CVS dirs..." 191 einfo "Searching for CVS dirs..."
151 cvsdirs="`find . -iname CVS -print`" 192 cvsdirs="`$run find . -iname CVS -print`"
152 debug-print "$FUNCNAME: CVS dirs found:" 193 debug-print "$FUNCNAME: CVS dirs found:"
153 debug-print "$cvsdirs" 194 debug-print "$cvsdirs"
154 195
155 einfo "Modifying CVS dirs..." 196 einfo "Modifying CVS dirs..."
156 for x in $cvsdirs; do 197 for x in $cvsdirs; do
157 debug-print "In $x" 198 debug-print "In $x"
158 echo $newserver > $x/Root 199 $run echo "$server" > "$x/Root"
159 done 200 done
160 201
161 fi 202 fi
203 fi
162 204
205 # prepare a cvspass file just for this session, we don't want to mess with ~/.cvspass
206 touch "${T}/cvspass"
207 export CVS_PASSFILE="${T}/cvspass"
208 if [ -n "$ECVS_RUNAS" ]; then
209 chown "$ECVS_RUNAS" "${T}/cvspass"
210 fi
211
212 # the server string with the password in it, for login
213 cvsroot_pass=":${ECVS_AUTH}:${ECVS_USER}:${ECVS_PASS}@${ECVS_SERVER}"
214 # ditto without the password, for checkout/update after login, so that
215 # the CVS/Root files don't contain the password in plaintext
216 cvsroot_nopass=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}"
217
218 # commands to run
219 cmdlogin="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_pass}\" login"
220 cmdupdate="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_nopass}\" update ${ECVS_UP_OPTS} ${ECVS_LOCALNAME}"
221 cmdcheckout="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_nopass}\" checkout ${ECVS_CO_OPTS} ${ECVS_MODULE}"
222
223 cd "${ECVS_TOP_DIR}"
224 if [ "${ECVS_AUTH}" == "pserver" ]; then
225 einfo "Running $cmdlogin"
226 eval $cmdlogin || die "cvs login command failed"
227 if [ "${mode}" == "update" ]; then
228 einfo "Running $cmdupdate"
229 eval $cmdupdate || die "cvs update command failed"
230 elif [ "${mode}" == "checkout" ]; then
231 einfo "Running $cmdcheckout"
232 eval $cmdcheckout|| die "cvs checkout command failed"
163 fi 233 fi
234 elif [ "${ECVS_AUTH}" == "ext" ]; then
235 #no login needed for ext
236 if [ "${mode}" == "update" ]; then
237 einfo "Running $cmdupdate"
238 eval $cmdupdate || die "cvs update command failed"
239 elif [ "${mode}" == "checkout" ]; then
240 einfo "Running $cmdcheckout"
241 eval $cmdcheckout|| die "cvs checkout command failed"
242 fi
243 fi
164 244
165 # finally run the cvs update command 245 # restore ownership. not sure why this is needed, but someone added it in the orig ECVS_RUNAS stuff.
166 debug-print "$FUNCNAME: running $ECVS_CVS_COMMAND update with $ECVS_SERVER for module $ECVS_MODULE subdir $ECVS_SUBDIR" 246 if [ -n "$ECVS_RUNAS" ]; then
167 einfo "Running $ECVS_CVS_COMMAND update with $ECVS_SERVER for $ECVS_MODULE/$ECVS_SUBDIR..." 247 chown `whoami` "${T}/cvspass"
168 $ECVS_CVS_COMMAND update -dP || die "died running cvs update" 248 fi
169 249
170} 250}
171 251
252
172cvs_src_unpack() { 253cvs_src_unpack() {
173 254
174 debug-print-function $FUNCNAME $* 255 debug-print-function $FUNCNAME $*
175 cvs_fetch || die "died running cvs_fetch"
176 256
257 debug-print "$FUNCNAME: init:
258 ECVS_CVS_COMMAND=$ECVS_CVS_COMMAND
259 ECVS_UP_OPTS=$ECVS_UP_OPTS
260 ECVS_CO_OPTS=$ECVS_CO_OPTS
261 ECVS_TOP_DIR=$ECVS_TOP_DIR
262 ECVS_SERVER=$ECVS_SERVER
263 ECVS_USER=$ECVS_USER
264 ECVS_PASS=$ECVS_PASS
265 ECVS_MODULE=$ECVS_MODULE
266 ECVS_LOCAL=$ECVS_LOCAL
267 ECVS_RUNAS=$ECVS_RUNAS
268 ECVS_LOCALNAME=$ECVS_LOCALNAME"
269
270 [ -z "$ECVS_MODULE" ] && die "ERROR: CVS module not set, cannot continue."
271
272 # merely setting this default value makes things fail when cvs_src_unpack is called
273 # more than once per ebuild (eg kdenonbeta submodules); so if we set a default value,
274 # we disable it again at the function's end.
275 # of course, we could instead always reference it with the bash syntax for 'take default
276 # value from this other variable if undefined', but i'm lazy.
277 if [ -z "$ECVS_LOCALNAME" ]; then
278 ECVS_LOCALNAME="$ECVS_MODULE"
279 ECVS_LOCALNAME_SETDEFAULT=true
280 fi
281
282
283 if [ "$ECVS_SERVER" == "offline" ]; then
284 # we're not required to fetch anything, the module already exists and shouldn't be updated
285 if [ -d "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}" ]; then
286 debug-print "$FUNCNAME: offline mode"
287 else
288 debug-print "$FUNCNAME: offline mode specified but directory ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} not found, exiting with error"
289 die "ERROR: Offline mode specified, but dir ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} not found. Aborting."
290 fi
291 elif [ -n "$ECVS_SERVER" ]; then # ECVS_SERVER!=offline --> real fetching mode
292 einfo "Fetching cvs module $ECVS_MODULE into $ECVS_TOP_DIR..."
293 cvs_fetch
294 else # ECVS_SERVER not set
295 die "ERROR: CVS server not set, cannot continue."
296 fi
297
177 einfo "Copying module $ECVS_MODULE from $ECVS_TOP_DIR..." 298 einfo "Copying $ECVS_MODULE from $ECVS_TOP_DIR..."
178 debug-print "Copying module $ECVS_MODULE from $ECVS_TOP_DIR..." 299 debug-print "Copying module $ECVS_MODULE local_mode=$ECVS_LOCAL from $ECVS_TOP_DIR..."
179 # the reason this lives here and not in kde-source_src_unpack 300
180 # is that in the future after copying the sources we might need to 301 # probably redundant, but best to make sure
181 # delete them, so this has to be self-contained 302 mkdir -p "$WORKDIR/$ECVS_LOCALNAME"
182 [ -n "$ECVS_SUBDIR" ] && cp -Rf $ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR $WORKDIR \ 303
183 || cp -Rf $ECVS_TOP_DIR/$ECVS_MODULE $WORKDIR 304 if [ -n "$ECVS_LOCAL" ]; then
184 305 cp -f "$ECVS_TOP_DIR/$ECVS_LOCALNAME"/* "$WORKDIR/$ECVS_LOCALNAME"
306 else
307 cp -Rf "$ECVS_TOP_DIR/$ECVS_LOCALNAME" "$WORKDIR/$ECVS_LOCALNAME/.."
308 fi
309
310 # if the directory is empty, remove it; empty directories cannot exist in cvs.
311 # this happens when fex. kde-source requests module/doc/subdir which doesn't exist.
312 # still create the empty directory in workdir though.
313 if [ "`ls -A \"${ECVS_TOP_DIR}/${ECVS_LOCALNAME}\"`" == "CVS" ]; then
314 debug-print "$FUNCNAME: removing cvs-empty directory $ECVS_LOCALNAME"
315 rm -rf "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}"
316 fi
317
185 # implement some of base_src_unpack's functionality; 318 # implement some of base_src_unpack's functionality;
186 # note however that base.eclass may not have been inherited! 319 # note however that base.eclass may not have been inherited!
187 if [ -n "$PATCHES" ]; then 320 if [ -n "$PATCHES" ]; then
188 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching" 321 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching"
189 cd $S 322 cd "$S"
190 for x in $PATCHES; do 323 for x in $PATCHES; do
191 debug-print "patching from $x" 324 debug-print "patching from $x"
192 patch -p0 < $x 325 patch -p0 < "$x"
193 done 326 done
194 fi 327 # make sure we don't try to apply patches more than once, since
328 # cvs_src_unpack is usually called several times from e.g. kde-source_src_unpack
329 export PATCHES=""
330 fi
331
332 if [ -n "$ECVS_LOCALNAME_SETDEFAULT" ]; then
333 unset ECVS_LOCALNAME
334 unset ECVS_LOCALNAME_SETDEFAULT
335 fi
336
337 einfo "Module ${ECVS_MODULE} is now in ${WORKDIR}"
195 338
196} 339}
197 340
198EXPORT_FUNCTIONS src_unpack 341EXPORT_FUNCTIONS src_unpack
199
200

Legend:
Removed from v.1.6  
changed lines
  Added in v.1.49

  ViewVC Help
Powered by ViewVC 1.1.20