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

Diff of /eclass/cvs.eclass

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

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

Legend:
Removed from v.1.12  
changed lines
  Added in v.1.48

  ViewVC Help
Powered by ViewVC 1.1.20