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

Diff of /eclass/cvs.eclass

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

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

Legend:
Removed from v.1.26  
changed lines
  Added in v.1.36

  ViewVC Help
Powered by ViewVC 1.1.20