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

Diff of /eclass/cvs.eclass

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

Revision 1.56 Revision 1.70
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2008 Gentoo Foundation
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.56 2005/07/06 20:20:03 agriffis Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.70 2008/04/27 07:00:40 ulm Exp $
4 4
5# Current Maintainer: Tal Peer <coredumb@gentoo.org> 5# @ECLASS: cvs.eclass
6# Original Author: Dan Armak <danarmak@gentoo.org> 6# @MAINTAINER:
7 7# vapier@gentoo.org (and anyone who wants to help)
8# SSH auth code by Danny <danny.milo@gmx.net> 8# @BLURB: This eclass provides generic cvs fetching functions
9 9# @DESCRIPTION:
10# SSH password authentication support and host key verification
11# support by Jeremy Maitin-Shepard <jbms@gentoo.org>
12
13
14# This eclass provides the generic cvs fetching functions. To use 10# This eclass provides the generic cvs fetching functions. To use this from an
15# this from an ebuild, set the `ebuild-configurable settings' as 11# ebuild, set the ECLASS VARIABLES as specified below in your ebuild before
16# specified below in your ebuild before inheriting. Then either leave 12# inheriting. Then either leave the default src_unpack or extend over
17# the default src_unpack or extend over cvs_src_unpack. If you find 13# cvs_src_unpack. If you find that you need to call the cvs_* functions
18# that you need to call the cvs_* functions directly, I'd be
19# interested to hear about it. 14# directly, I'd be interested to hear about it.
15
16inherit eutils
20 17
21# TODO: 18# TODO:
22 19
23# Implement more auth types (gserver?, kserver?) 20# Implement more auth types (gserver?, kserver?)
24 21
25# Support additional remote shells with `ext' authentication (does 22# Support additional remote shells with `ext' authentication (does
26# anyone actually need to use it with anything other than SSH?) 23# anyone actually need to use it with anything other than SSH?)
27 24
28
29INHERITED="$INHERITED $ECLASS"
30 25
31# Users shouldn't change these settings! The ebuild/eclass inheriting 26# Users shouldn't change these settings! The ebuild/eclass inheriting
32# this eclass will take care of that. If you want to set the global 27# 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. 28# KDE cvs ebuilds' settings, see the comments in kde-source.eclass.
34 29
35# --- begin ebuild-configurable settings 30# @ECLASS-VARIABLE: ECVS_CVS_COMMAND
36 31# @DESCRIPTION:
37# ECVS_CVS_COMMAND -- CVS command to run 32# CVS command to run
38# 33#
39# You can set, for example, "cvs -t" for extensive debug information 34# You can set, for example, "cvs -t" for extensive debug information
40# on the cvs connection. The default of "cvs -q -f -z4" means to be 35# on the cvs connection. The default of "cvs -q -f -z4" means to be
41# quiet, to disregard the ~/.cvsrc config file and to use maximum 36# quiet, to disregard the ~/.cvsrc config file and to use maximum
42# compression. 37# compression.
43 38
44[ -z "$ECVS_CVS_COMMAND" ] && ECVS_CVS_COMMAND="cvs -q -f -z4" 39# @ECLASS-VARIABLE: ECVS_CVS_COMPRESS
40# @DESCRIPTION:
41# Set the compression level.
42[[ -z ${ECVS_CVS_COMPRESS} ]] && ECVS_CVS_COMPRESS="-z1"
45 43
44# @ECLASS-VARIABLE: ECVS_CVS_OPTIONS
45# @DESCRIPTION:
46# Additional options to the cvs commands.
47[[ -z ${ECVS_CVS_OPTIONS} ]] && ECVS_CVS_OPTIONS="-q -f"
46 48
47# ECVS_UP_OPTS, ECVS_CO_OPTS -- CVS options given after the cvs 49# @ECLASS-VARIABLE: ECVS_CVS_COMMAND
48# command (update or checkout). 50# @DESCRIPTION:
49# 51# The cvs command.
50# Don't remove -dP from update or things won't work. 52[[ -z ${ECVS_CVS_COMMAND} ]] && ECVS_CVS_COMMAND="cvs ${ECVS_CVS_OPTIONS} ${ECVS_CVS_COMPRESS}"
51 53
54# @ECLASS-VARIABLE: ECVS_UP_OPTS
55# @DESCRIPTION:
56# CVS options given after the cvs update command. Don't remove "-dP" or things
57# won't work.
52[ -z "$ECVS_UP_OPTS" ] && ECVS_UP_OPTS="-dP" 58[ -z "$ECVS_UP_OPTS" ] && ECVS_UP_OPTS="-dP"
59
60# @ECLASS-VARIABLE: ECVS_CO_OPTS
61# @DESCRIPTION:
62# CVS options given after the cvs checkout command.
53[ -z "$ECVS_CO_OPTS" ] && ECVS_CO_OPTS="" 63[ -z "$ECVS_CO_OPTS" ] && ECVS_CO_OPTS=""
54 64
55 65
66# @ECLASS-VARIABLE: ECVS_LOCAL
67# @DESCRIPTION:
56# ECVS_LOCAL -- If this is set, the CVS module will be fetched 68# If this is set, the CVS module will be fetched non-recursively.
57# non-recursively. Refer to the information in the CVS man page 69# Refer to the information in the CVS man page regarding the -l
58# regarding the -l command option (not the -l global option). 70# command option (not the -l global option).
59 71
60 72# @ECLASS-VARIABLE: ECVS_LOCALNAME
73# @DESCRIPTION:
61# ECVS_LOCALNAME -- local name of checkout directory 74# Local name of checkout directory
62# 75#
63# This is useful if the module on the server is called something 76# This is useful if the module on the server is called something
64# common like 'driver' or is nested deep in a tree, and you don't like 77# common like 'driver' or is nested deep in a tree, and you don't like
65# useless empty directories. 78# useless empty directories.
66# 79#
67# WARNING: Set this only from within ebuilds! If set in your shell or 80# WARNING: Set this only from within ebuilds! If set in your shell or
68# some such, things will break because the ebuild won't expect it and 81# some such, things will break because the ebuild won't expect it and
69# have e.g. a wrong $S setting. 82# have e.g. a wrong $S setting.
70 83
71 84# @ECLASS-VARIABLE: ECVS_TOP_DIR
85# @DESCRIPTION:
72# ECVS_TOP_DIR -- The directory under which CVS modules are checked 86# The directory under which CVS modules are checked out.
73# out.
74
75[ -z "$ECVS_TOP_DIR" ] && ECVS_TOP_DIR="${DISTDIR}/cvs-src" 87[ -z "$ECVS_TOP_DIR" ] && ECVS_TOP_DIR="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/cvs-src"
76 88
77# ECVS_SERVER -- CVS path 89# @ECLASS-VARIABLE: ECVS_SERVER
90# @DESCRIPTION:
91# CVS path
78# 92#
79# The format is "server:/dir", e.g. "anoncvs.kde.org:/home/kde". 93# The format is "server:/dir", e.g. "anoncvs.kde.org:/home/kde".
80# Remove the other parts of the full CVSROOT, which might look like 94# Remove the other parts of the full CVSROOT, which might look like
81# ":pserver:anonymous@anoncvs.kde.org:/home/kde"; this is generated 95# ":pserver:anonymous@anoncvs.kde.org:/home/kde"; this is generated
82# using other settings also. 96# using other settings also.
83# 97#
84# Set this to "offline" to disable fetching (i.e. to assume the module 98# Set this to "offline" to disable fetching (i.e. to assume the module
85# is already checked out in ECVS_TOP_DIR). 99# is already checked out in ECVS_TOP_DIR).
86
87[ -z "$ECVS_SERVER" ] && ECVS_SERVER="offline" 100[ -z "$ECVS_SERVER" ] && ECVS_SERVER="offline"
88 101
89 102# @ECLASS-VARIABLE: ECVS_MODULE
103# @DESCRIPTION:
90# ECVS_MODULE -- the name of the CVS module to be fetched 104# The name of the CVS module to be fetched
91# 105#
92# This must be set when cvs_src_unpack is called. This can include 106# This must be set when cvs_src_unpack is called. This can include
93# several directory levels, i.e. "foo/bar/baz" 107# several directory levels, i.e. "foo/bar/baz"
94 108
95#[ -z "$ECVS_MODULE" ] && die "$ECLASS: error: ECVS_MODULE not set, cannot continue" 109#[ -z "$ECVS_MODULE" ] && die "$ECLASS: error: ECVS_MODULE not set, cannot continue"
96 110
97 111# @ECLASS-VARIABLE: ECVS_BRANCH
112# @DESCRIPTION:
98# ECVS_BRANCH -- the name of the branch/tag to use 113# The name of the branch/tag to use
99 114#
100# The default is "HEAD". The following default _will_ reset your 115# The default is "HEAD". The following default _will_ reset your
101# branch checkout to head if used. 116# branch checkout to head if used.
102 117
103#[ -z "$ECVS_BRANCH" ] && ECVS_BRANCH="HEAD" 118#[ -z "$ECVS_BRANCH" ] && ECVS_BRANCH="HEAD"
104 119
105 120# @ECLASS-VARIABLE: ECVS_AUTH
121# @DESCRIPTION:
106# ECVS_AUTH -- authentication method to use 122# Authentication method to use
107# 123#
108# Possible values are "pserver" and "ext". If `ext' authentication is 124# Possible values are "pserver" and "ext". If `ext' authentication is
109# used, the remote shell to use can be specified in CVS_RSH (SSH is 125# used, the remote shell to use can be specified in CVS_RSH (SSH is
110# used by default). Currently, the only supported remote shell for 126# used by default). Currently, the only supported remote shell for
111# `ext' authentication is SSH. 127# `ext' authentication is SSH.
116# e.g. 132# e.g.
117# "cvs -danoncvs@savannah.gnu.org:/cvsroot/backbone co System" 133# "cvs -danoncvs@savannah.gnu.org:/cvsroot/backbone co System"
118# ( from gnustep-apps/textedit ) 134# ( from gnustep-apps/textedit )
119[ -z "$ECVS_AUTH" ] && ECVS_AUTH="pserver" 135[ -z "$ECVS_AUTH" ] && ECVS_AUTH="pserver"
120 136
137# @ECLASS-VARIABLE: ECVS_USER
138# @DESCRIPTION:
121# ECVS_USER -- Username to use for authentication on the remote server 139# Username to use for authentication on the remote server.
122[ -z "$ECVS_USER" ] && ECVS_USER="anonymous" 140[ -z "$ECVS_USER" ] && ECVS_USER="anonymous"
123 141
124 142# @ECLASS-VARIABLE: ECVS_PASS
143# @DESCRIPTION:
125# ECVS_PASS -- Password to use for authentication on the remote server 144# Password to use for authentication on the remote server
126[ -z "$ECVS_PASS" ] && ECVS_PASS="" 145[ -z "$ECVS_PASS" ] && ECVS_PASS=""
127 146
128 147# @ECLASS-VARIABLE: ECVS_SSH_HOST_KEY
129# ECVS_SSH_HOST_KEY 148# @DESCRIPTION:
130#
131# If SSH is used for `ext' authentication, use this variable to 149# If SSH is used for `ext' authentication, use this variable to
132# specify the host key of the remote server. The format of the value 150# specify the host key of the remote server. The format of the value
133# should be the same format that is used for the SSH known hosts file. 151# should be the same format that is used for the SSH known hosts file.
134# 152#
135# WARNING: If a SSH host key is not specified using this variable, the 153# WARNING: If a SSH host key is not specified using this variable, the
136# remote host key will not be verified. 154# remote host key will not be verified.
137 155
138 156# @ECLASS-VARIABLE: ECVS_CLEAN
157# @DESCRIPTION:
139# ECVS_CLEAN -- Set this to get a clean copy when updating (passes the 158# Set this to get a clean copy when updating (passes the
140# -C option to cvs update) 159# -C option to cvs update)
141 160
142 161# @ECLASS-VARIABLE: ECVS_RUNAS
143# ECVS_RUNAS 162# @DESCRIPTION:
144#
145# Specifies an alternate (non-root) user to use to run cvs. Currently 163# Specifies an alternate (non-root) user to use to run cvs. Currently
146# b0rked and wouldn't work with portage userpriv anyway without 164# b0rked and wouldn't work with portage userpriv anyway without
147# special magic. 165# special magic.
148 166
149# [ -z "$ECVS_RUNAS" ] && ECVS_RUNAS="`whoami`" 167# [ -z "$ECVS_RUNAS" ] && ECVS_RUNAS="`whoami`"
150 168
151
152# ECVS_SUBDIR -- deprecated, do not use 169# ECVS_SUBDIR -- deprecated, do not use
153[ -n "$ECVS_SUBDIR" ] && die "ERROR: deprecated ECVS_SUBDIR defined. Please fix this ebuild." 170[ -n "$ECVS_SUBDIR" ] && die "ERROR: deprecated ECVS_SUBDIR defined. Please fix this ebuild."
154
155
156# --- end ebuild-configurable settings ---
157 171
158# add cvs to deps 172# add cvs to deps
159# ssh is used for ext auth 173# ssh is used for ext auth
160# sudo is used to run as a specified user 174# sudo is used to run as a specified user
161DEPEND="$DEPEND dev-util/cvs app-admin/sudo" 175DEPEND="dev-util/cvs"
176
177[ -n "$ECVS_RUNAS" ] && DEPEND="$DEPEND app-admin/sudo"
162 178
163if [ "$ECVS_AUTH" == "ext" ]; then 179if [ "$ECVS_AUTH" == "ext" ]; then
164 #default to ssh 180 #default to ssh
165 [ -z "$CVS_RSH" ] && export SSH_RSH="ssh" 181 [ -z "$CVS_RSH" ] && export CVS_RSH="ssh"
166 if [ "$CVS_RSH" != "ssh" ]; then 182 if [ "$CVS_RSH" != "ssh" ]; then
167 die "Support for ext auth with clients other than ssh has not been implemented yet" 183 die "Support for ext auth with clients other than ssh has not been implemented yet"
168 fi 184 fi
169 DEPEND="$DEPEND net-misc/openssh" 185 DEPEND="${DEPEND} net-misc/openssh"
170fi 186fi
171 187
172# called from cvs_src_unpack 188# called from cvs_src_unpack
173cvs_fetch() { 189cvs_fetch() {
174 190
177 193
178 local ECVS_COMMAND="${ECVS_COMMAND}" 194 local ECVS_COMMAND="${ECVS_COMMAND}"
179 local ECVS_UP_OPTS="${ECVS_UP_OPTS}" 195 local ECVS_UP_OPTS="${ECVS_UP_OPTS}"
180 local ECVS_CO_OPTS="${ECVS_CO_OPTS}" 196 local ECVS_CO_OPTS="${ECVS_CO_OPTS}"
181 197
182 # Fix for sourceforge which doesnt want -z>3 anymore.
183
184 (echo $ECVS_SERVER | grep -q sourceforge) \
185 && [ "$ECVS_CVS_COMMAND" == "cvs -q -f -z4" ] \
186 && ECVS_CVS_COMMAND="cvs -q -f -z3"
187
188 debug-print-function $FUNCNAME $* 198 debug-print-function $FUNCNAME $*
189 199
190 # Update variables that are modified by ebuild parameters, which 200 # Update variables that are modified by ebuild parameters, which
191 # should be effective every time cvs_fetch is called, and not just 201 # should be effective every time cvs_fetch is called, and not just
192 # every time cvs.eclass is inherited 202 # every time cvs.eclass is inherited
193 203
194
195 # Handle parameter for local (non-recursive) fetching 204 # Handle parameter for local (non-recursive) fetching
196 205
197 if [ -n "$ECVS_LOCAL" ]; then 206 if [ -n "$ECVS_LOCAL" ]; then
198 ECVS_UP_OPTS="$ECVS_UP_OPTS -l" 207 ECVS_UP_OPTS="$ECVS_UP_OPTS -l"
199 ECVS_CO_OPTS="$ECVS_CO_OPTS -l" 208 ECVS_CO_OPTS="$ECVS_CO_OPTS -l"
200 fi 209 fi
201 210
202 # Handle ECVS_BRANCH option 211 # Handle ECVS_BRANCH option
203 # 212 #
204 # Because CVS auto-switches branches, we just have to pass the 213 # Because CVS auto-switches branches, we just have to pass the
205 # correct -rBRANCH option when updating. 214 # correct -rBRANCH option when updating.
206 215
207 if [ -n "$ECVS_BRANCH" ]; then 216 if [ -n "$ECVS_BRANCH" ]; then
208 ECVS_UP_OPTS="$ECVS_UP_OPTS -r$ECVS_BRANCH" 217 ECVS_UP_OPTS="$ECVS_UP_OPTS -r$ECVS_BRANCH"
278 # be put in Root 287 # be put in Root
279 if [ "$ECVS_AUTH" == "no" ] 288 if [ "$ECVS_AUTH" == "no" ]
280 then 289 then
281 local server="${ECVS_USER}@${ECVS_SERVER}" 290 local server="${ECVS_USER}@${ECVS_SERVER}"
282 else 291 else
292 local connection="${ECVS_AUTH}"
293 [[ -n ${ECVS_PROXY} ]] && connection="${connection};proxy=${ECVS_PROXY}"
294 [[ -n ${ECVS_PROXY_PORT} ]] && connection="${connection};proxyport=${ECVS_PROXY_PORT}"
283 local server=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}" 295 local server=":${connection}:${ECVS_USER}@${ECVS_SERVER}"
284 fi 296 fi
285 297
286 # Switch servers automagically if needed 298 # Switch servers automagically if needed
287 if [ "$mode" == "update" ]; then 299 if [ "$mode" == "update" ]; then
288 cd /$ECVS_TOP_DIR/$ECVS_LOCALNAME 300 cd /$ECVS_TOP_DIR/$ECVS_LOCALNAME
339 eval $cmdlogin || die "cvs login command failed" 351 eval $cmdlogin || die "cvs login command failed"
340 if [ "${mode}" == "update" ]; then 352 if [ "${mode}" == "update" ]; then
341 einfo "Running $cmdupdate" 353 einfo "Running $cmdupdate"
342 eval $cmdupdate || die "cvs update command failed" 354 eval $cmdupdate || die "cvs update command failed"
343 elif [ "${mode}" == "checkout" ]; then 355 elif [ "${mode}" == "checkout" ]; then
344 einfo "Running $cmdcheckout" 356 einfo "Running $cmdcheckout"
345 eval $cmdcheckout|| die "cvs checkout command failed" 357 eval $cmdcheckout|| die "cvs checkout command failed"
346 fi 358 fi
347 elif [ "${ECVS_AUTH}" == "ext" ] || [ "${ECVS_AUTH}" == "no" ]; then 359 elif [ "${ECVS_AUTH}" == "ext" ] || [ "${ECVS_AUTH}" == "no" ]; then
348 360
349 # Hack to support SSH password authentication 361 # Hack to support SSH password authentication
414 echo "${CVS_ECLASS_STRICT_HOST_CHECKING}')" \ 426 echo "${CVS_ECLASS_STRICT_HOST_CHECKING}')" \
415 >> "${CVS_RSH}" 427 >> "${CVS_RSH}"
416 echo "os.execv('/usr/bin/ssh', newarglist)" \ 428 echo "os.execv('/usr/bin/ssh', newarglist)" \
417 >> "${CVS_RSH}" 429 >> "${CVS_RSH}"
418 430
419 chmod a+x "${CVS_RSH}" 431 chmod a+x "${CVS_RSH}"
420 432
421 # Make sure DISPLAY is set (SSH will not use SSH_ASKPASS 433 # Make sure DISPLAY is set (SSH will not use SSH_ASKPASS
422 # if DISPLAY is not set) 434 # if DISPLAY is not set)
423 435
424 [ -z "${DISPLAY}" ] && DISPLAY="DISPLAY" 436 [ -z "${DISPLAY}" ] && DISPLAY="DISPLAY"
425 export DISPLAY 437 export DISPLAY
426 438
427 # Create a dummy executable to echo $ECVS_PASS 439 # Create a dummy executable to echo $ECVS_PASS
428 440
429 export SSH_ASKPASS="${T}/cvs_sshechopass" 441 export SSH_ASKPASS="${T}/cvs_sshechopass"
430 if [ "${ECVS_AUTH}" != "no" ]; then 442 if [ "${ECVS_AUTH}" != "no" ]; then
431 echo -en "#!/bin/bash\necho \"$ECVS_PASS\"\n" \ 443 echo -en "#!/bin/bash\necho \"$ECVS_PASS\"\n" \
432 > "${SSH_ASKPASS}" 444 > "${SSH_ASKPASS}"
433 else 445 else
434 echo -en "#!/bin/bash\nreturn\n" \ 446 echo -en "#!/bin/bash\nreturn\n" \
435 > "${SSH_ASKPASS}" 447 > "${SSH_ASKPASS}"
436 448
437 fi 449 fi
438 chmod a+x "${SSH_ASKPASS}" 450 chmod a+x "${SSH_ASKPASS}"
439 fi 451 fi
440 452
441 if [ "${mode}" == "update" ]; then 453 if [ "${mode}" == "update" ]; then
442 einfo "Running $cmdupdate" 454 einfo "Running $cmdupdate"
443 eval $cmdupdate || die "cvs update command failed" 455 eval $cmdupdate || die "cvs update command failed"
444 elif [ "${mode}" == "checkout" ]; then 456 elif [ "${mode}" == "checkout" ]; then
445 einfo "Running $cmdcheckout" 457 einfo "Running $cmdcheckout"
446 eval $cmdcheckout|| die "cvs checkout command failed" 458 eval $cmdcheckout|| die "cvs checkout command failed"
447 fi 459 fi
448 460
449 # Restore environment variable values 461 # Restore environment variable values
450 export CVS_RSH="${CVS_ECLASS_ORIG_CVS_RSH}" 462 export CVS_RSH="${CVS_ECLASS_ORIG_CVS_RSH}"
451 if [ "${CVS_ECLASS_ORIG_SSH_ASKPASS+set}" == "set" ]; then 463 if [ "${CVS_ECLASS_ORIG_SSH_ASKPASS+set}" == "set" ]; then
452 export SSH_ASKPASS="${CVS_ECLASS_ORIG_SSH_ASKPASS}" 464 export SSH_ASKPASS="${CVS_ECLASS_ORIG_SSH_ASKPASS}"
453 else 465 else
467 chown `whoami` "${T}/cvspass" 479 chown `whoami` "${T}/cvspass"
468 fi 480 fi
469 481
470} 482}
471 483
472 484# @FUNCTION: cvs_src_unpack
485# @DESCRIPTION:
486# The cvs src_unpack function, which will be exported
473cvs_src_unpack() { 487cvs_src_unpack() {
474 488
475 debug-print-function $FUNCNAME $* 489 debug-print-function $FUNCNAME $*
476 490
477 debug-print "$FUNCNAME: init: 491 debug-print "$FUNCNAME: init:
490 [ -z "$ECVS_MODULE" ] && die "ERROR: CVS module not set, cannot continue." 504 [ -z "$ECVS_MODULE" ] && die "ERROR: CVS module not set, cannot continue."
491 505
492 local ECVS_LOCALNAME="${ECVS_LOCALNAME}" 506 local ECVS_LOCALNAME="${ECVS_LOCALNAME}"
493 507
494 if [ -z "$ECVS_LOCALNAME" ]; then 508 if [ -z "$ECVS_LOCALNAME" ]; then
495 ECVS_LOCALNAME="$ECVS_MODULE" 509 ECVS_LOCALNAME="$ECVS_MODULE"
496 fi 510 fi
497 511
498 if [ "$ECVS_SERVER" == "offline" ]; then 512 local sanitized_pn=$(echo "${PN}" | LC_ALL=C sed -e 's:[^A-Za-z0-9_]:_:g')
513 local offline_pkg_var="ECVS_OFFLINE_${sanitized_pn}"
514 if [ "${!offline_pkg_var}" == "1" -o "$ECVS_OFFLINE" == "1" -o "$ECVS_SERVER" == "offline" ]; then
499 # We're not required to fetch anything; the module already 515 # We're not required to fetch anything; the module already
500 # exists and shouldn't be updated. 516 # exists and shouldn't be updated.
501 if [ -d "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}" ]; then 517 if [ -d "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}" ]; then
502 debug-print "$FUNCNAME: offline mode" 518 debug-print "$FUNCNAME: offline mode"
503 else 519 else
504 debug-print "$FUNCNAME: Offline mode specified but directory ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} not found, exiting with error" 520 debug-print "$FUNCNAME: Offline mode specified but directory ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} not found, exiting with error"
505 die "ERROR: Offline mode specified, but directory ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} not found. Aborting." 521 die "ERROR: Offline mode specified, but directory ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} not found. Aborting."
506 fi 522 fi
535 # Implement some of base_src_unpack's functionality; note however 551 # Implement some of base_src_unpack's functionality; note however
536 # that base.eclass may not have been inherited! 552 # that base.eclass may not have been inherited!
537 if [ -n "$PATCHES" ]; then 553 if [ -n "$PATCHES" ]; then
538 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching" 554 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching"
539 cd "$S" 555 cd "$S"
540 for x in $PATCHES; do 556 epatch ${PATCHES}
541 debug-print "patching from $x"
542 patch -p0 < "$x"
543 done
544 # Make sure we don't try to apply patches more than once, 557 # Make sure we don't try to apply patches more than once,
545 # since cvs_src_unpack is usually called several times from 558 # since cvs_src_unpack is usually called several times from
546 # e.g. kde-source_src_unpack 559 # e.g. kde-source_src_unpack
547 export PATCHES="" 560 export PATCHES=""
548 fi 561 fi
549 562
550 einfo "CVS module ${ECVS_MODULE} is now in ${WORKDIR}" 563 einfo "CVS module ${ECVS_MODULE} is now in ${WORKDIR}"
551} 564}
552 565
553EXPORT_FUNCTIONS src_unpack 566EXPORT_FUNCTIONS src_unpack

Legend:
Removed from v.1.56  
changed lines
  Added in v.1.70

  ViewVC Help
Powered by ViewVC 1.1.20