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

Diff of /eclass/cvs.eclass

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

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

Legend:
Removed from v.1.18  
changed lines
  Added in v.1.45

  ViewVC Help
Powered by ViewVC 1.1.20