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

Diff of /eclass/subversion.eclass

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

Revision 1.63 Revision 1.78
1# Copyright 1999-2009 Gentoo Foundation 1# Copyright 1999-2012 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/subversion.eclass,v 1.63 2009/04/26 02:18:09 arfrever Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.78 2012/06/10 11:05:46 hattya Exp $
4 4
5# @ECLASS: subversion.eclass 5# @ECLASS: subversion.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Akinori Hattori <hattya@gentoo.org> 7# Akinori Hattori <hattya@gentoo.org>
8# Bo ├śrsted Andresen <zlin@gentoo.org> 8# @AUTHOR:
9# Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
10#
11# Original Author: Akinori Hattori <hattya@gentoo.org> 9# Original Author: Akinori Hattori <hattya@gentoo.org>
12#
13# @BLURB: The subversion eclass is written to fetch software sources from subversion repositories 10# @BLURB: The subversion eclass is written to fetch software sources from subversion repositories
14# @DESCRIPTION: 11# @DESCRIPTION:
15# The subversion eclass provides functions to fetch, patch and bootstrap 12# The subversion eclass provides functions to fetch, patch and bootstrap
16# software sources from subversion repositories. 13# software sources from subversion repositories.
17 14
18inherit eutils 15inherit eutils
19 16
20ESVN="${ECLASS}" 17ESVN="${ECLASS}"
21 18
19case "${EAPI:-0}" in
20 0|1)
22EXPORT_FUNCTIONS src_unpack pkg_preinst 21 EXPORT_FUNCTIONS src_unpack pkg_preinst
22 ;;
23 *)
24 EXPORT_FUNCTIONS src_unpack src_prepare pkg_preinst
25 ;;
26esac
23 27
24DESCRIPTION="Based on the ${ECLASS} eclass" 28DESCRIPTION="Based on the ${ECLASS} eclass"
25 29
26DEPEND="dev-util/subversion 30SUBVERSION_DEPEND="dev-vcs/subversion
27 net-misc/rsync" 31 net-misc/rsync"
32
33if [[ -z "${ESVN_DISABLE_DEPENDENCIES}" ]]; then
34 DEPEND="${SUBVERSION_DEPEND}"
35fi
28 36
29# @ECLASS-VARIABLE: ESVN_STORE_DIR 37# @ECLASS-VARIABLE: ESVN_STORE_DIR
30# @DESCRIPTION: 38# @DESCRIPTION:
31# subversion sources store directory. Users may override this in /etc/make.conf 39# subversion sources store directory. Users may override this in /etc/make.conf
32[[ -z ${ESVN_STORE_DIR} ]] && ESVN_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src" 40[[ -z ${ESVN_STORE_DIR} ]] && ESVN_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src"
131# restrict. 139# restrict.
132# export) 140# export)
133# don't export the working copy to S. 141# don't export the working copy to S.
134ESVN_RESTRICT="${ESVN_RESTRICT:-}" 142ESVN_RESTRICT="${ESVN_RESTRICT:-}"
135 143
144# @ECLASS-VARIABLE: ESVN_DISABLE_DEPENDENCIES
145# @DESCRIPTION:
146# Set this variable to a non-empty value to disable the automatic inclusion of
147# Subversion in dependencies.
148ESVN_DISABLE_DEPENDENCIES="${ESVN_DISABLE_DEPENDENCIES:-}"
149
136# @ECLASS-VARIABLE: ESVN_OFFLINE 150# @ECLASS-VARIABLE: ESVN_OFFLINE
137# @DESCRIPTION: 151# @DESCRIPTION:
138# Set this variable to a non-empty value to disable the automatic updating of 152# Set this variable to a non-empty value to disable the automatic updating of
139# an svn source tree. This is intended to be set outside the subversion source 153# an svn source tree. This is intended to be set outside the subversion source
140# tree by users. 154# tree by users.
141ESVN_OFFLINE="${ESVN_OFFLINE:-${ESCM_OFFLINE}}" 155ESVN_OFFLINE="${ESVN_OFFLINE:-${EVCS_OFFLINE}}"
156
157# @ECLASS-VARIABLE: ESVN_UMASK
158# @DESCRIPTION:
159# Set this variable to a custom umask. This is intended to be set by users.
160# By setting this to something like 002, it can make life easier for people
161# who do development as non-root (but are in the portage group), and then
162# switch over to building with FEATURES=userpriv. Or vice-versa. Shouldn't
163# be a security issue here as anyone who has portage group write access
164# already can screw the system over in more creative ways.
165ESVN_UMASK="${ESVN_UMASK:-${EVCS_UMASK}}"
142 166
143# @ECLASS-VARIABLE: ESVN_UP_FREQ 167# @ECLASS-VARIABLE: ESVN_UP_FREQ
144# @DESCRIPTION: 168# @DESCRIPTION:
145# Set the minimum number of hours between svn up'ing in any given svn module. This is particularly 169# Set the minimum number of hours between svn up'ing in any given svn module. This is particularly
146# useful for split KDE ebuilds where we want to ensure that all submodules are compiled for the same 170# useful for split KDE ebuilds where we want to ensure that all submodules are compiled for the same
175 199
176 [[ -n "${ESVN_REVISION}" ]] && revision="${ESVN_REVISION}" 200 [[ -n "${ESVN_REVISION}" ]] && revision="${ESVN_REVISION}"
177 201
178 # check for the protocol 202 # check for the protocol
179 local protocol="${repo_uri%%:*}" 203 local protocol="${repo_uri%%:*}"
180
181 case "${protocol}" in 204 case "${protocol}" in
182 http|https) 205 http|https)
183 if ! built_with_use --missing true -o dev-util/subversion webdav-neon webdav-serf || \ 206 if ! built_with_use -o dev-vcs/subversion webdav-neon webdav-serf; then
184 built_with_use --missing false dev-util/subversion nowebdav; then
185 echo 207 echo
186 eerror "In order to emerge this package, you need to" 208 eerror "In order to emerge this package, you need to"
187 eerror "reinstall Subversion with support for WebDAV." 209 eerror "reinstall Subversion with support for WebDAV."
188 eerror "Subversion requires either Neon or Serf to support WebDAV." 210 eerror "Subversion requires either Neon or Serf to support WebDAV."
189 echo 211 echo
198 esac 220 esac
199 221
200 addread "/etc/subversion" 222 addread "/etc/subversion"
201 addwrite "${ESVN_STORE_DIR}" 223 addwrite "${ESVN_STORE_DIR}"
202 224
225 if [[ -n "${ESVN_UMASK}" ]]; then
226 eumask_push "${ESVN_UMASK}"
227 fi
228
203 if [[ ! -d ${ESVN_STORE_DIR} ]]; then 229 if [[ ! -d ${ESVN_STORE_DIR} ]]; then
204 debug-print "${FUNCNAME}: initial checkout. creating subversion directory" 230 debug-print "${FUNCNAME}: initial checkout. creating subversion directory"
205 mkdir -p "${ESVN_STORE_DIR}" || die "${ESVN}: can't mkdir ${ESVN_STORE_DIR}." 231 mkdir -m 775 -p "${ESVN_STORE_DIR}" || die "${ESVN}: can't mkdir ${ESVN_STORE_DIR}."
206 fi 232 fi
207 233
208 cd "${ESVN_STORE_DIR}" || die "${ESVN}: can't chdir to ${ESVN_STORE_DIR}" 234 pushd "${ESVN_STORE_DIR}" >/dev/null || die "${ESVN}: can't chdir to ${ESVN_STORE_DIR}"
209 235
210 local wc_path="$(subversion__get_wc_path "${repo_uri}")" 236 local wc_path="$(subversion__get_wc_path "${repo_uri}")"
211 local options="${ESVN_OPTIONS} --config-dir ${ESVN_STORE_DIR}/.subversion" 237 local options="${ESVN_OPTIONS} --config-dir ${ESVN_STORE_DIR}/.subversion"
212 238
213 [[ -n "${revision}" ]] && options="${options} -r ${revision}" 239 [[ -n "${revision}" ]] && options="${options} -r ${revision}"
215 if [[ "${ESVN_OPTIONS}" = *-r* ]]; then 241 if [[ "${ESVN_OPTIONS}" = *-r* ]]; then
216 ewarn "\${ESVN_OPTIONS} contains -r, this usage is unsupported. Please" 242 ewarn "\${ESVN_OPTIONS} contains -r, this usage is unsupported. Please"
217 ewarn "see \${ESVN_REPO_URI}" 243 ewarn "see \${ESVN_REPO_URI}"
218 fi 244 fi
219 245
220 if has_version ">=dev-util/subversion-1.6.0"; then 246 if has_version ">=dev-vcs/subversion-1.6.0"; then
221 options="${options} --config-option=config:auth:password-stores=" 247 options="${options} --config-option=config:auth:password-stores="
222 fi 248 fi
223 249
224 debug-print "${FUNCNAME}: wc_path = \"${wc_path}\"" 250 debug-print "${FUNCNAME}: wc_path = \"${wc_path}\""
225 debug-print "${FUNCNAME}: ESVN_OPTIONS = \"${ESVN_OPTIONS}\"" 251 debug-print "${FUNCNAME}: ESVN_OPTIONS = \"${ESVN_OPTIONS}\""
233 einfo "subversion check out start -->" 259 einfo "subversion check out start -->"
234 einfo " repository: ${repo_uri}${revision:+@}${revision}" 260 einfo " repository: ${repo_uri}${revision:+@}${revision}"
235 261
236 debug-print "${FUNCNAME}: ${ESVN_FETCH_CMD} ${options} ${repo_uri}" 262 debug-print "${FUNCNAME}: ${ESVN_FETCH_CMD} ${options} ${repo_uri}"
237 263
238 mkdir -p "${ESVN_PROJECT}" || die "${ESVN}: can't mkdir ${ESVN_PROJECT}." 264 mkdir -m 775 -p "${ESVN_PROJECT}" || die "${ESVN}: can't mkdir ${ESVN_PROJECT}."
239 cd "${ESVN_PROJECT}" || die "${ESVN}: can't chdir to ${ESVN_PROJECT}" 265 cd "${ESVN_PROJECT}" || die "${ESVN}: can't chdir to ${ESVN_PROJECT}"
240 if [[ -n "${ESVN_USER}" ]]; then 266 if [[ -n "${ESVN_USER}" ]]; then
241 ${ESVN_FETCH_CMD} ${options} --username "${ESVN_USER}" --password "${ESVN_PASSWORD}" "${repo_uri}" || die "${ESVN}: can't fetch to ${wc_path} from ${repo_uri}." 267 ${ESVN_FETCH_CMD} ${options} --username "${ESVN_USER}" --password "${ESVN_PASSWORD}" "${repo_uri}" || die "${ESVN}: can't fetch to ${wc_path} from ${repo_uri}."
242 else 268 else
243 ${ESVN_FETCH_CMD} ${options} "${repo_uri}" || die "${ESVN}: can't fetch to ${wc_path} from ${repo_uri}." 269 ${ESVN_FETCH_CMD} ${options} "${repo_uri}" || die "${ESVN}: can't fetch to ${wc_path} from ${repo_uri}."
244 fi 270 fi
245 271
246 elif [[ -n ${ESVN_OFFLINE} ]]; then 272 elif [[ -n ${ESVN_OFFLINE} ]]; then
273 svn upgrade "${wc_path}" &>/dev/null
247 svn cleanup "${wc_path}" 274 svn cleanup "${wc_path}" &>/dev/null
248 subversion_wc_info "${repo_uri}" || die "${ESVN}: unknown problem occurred while accessing working copy." 275 subversion_wc_info "${repo_uri}" || die "${ESVN}: unknown problem occurred while accessing working copy."
276
249 if [[ -n ${ESVN_REVISION} && ${ESVN_REVISION} != ${ESVN_WC_REVISION} ]]; then 277 if [[ -n ${ESVN_REVISION} && ${ESVN_REVISION} != ${ESVN_WC_REVISION} ]]; then
250 die "${ESVN}: You requested off-line updating and revision ${ESVN_REVISION} but only revision ${ESVN_WC_REVISION} is available locally." 278 die "${ESVN}: You requested off-line updating and revision ${ESVN_REVISION} but only revision ${ESVN_WC_REVISION} is available locally."
251 fi 279 fi
252 einfo "Fetching disabled: Using existing repository copy at revision ${ESVN_WC_REVISION}." 280 einfo "Fetching disabled: Using existing repository copy at revision ${ESVN_WC_REVISION}."
253 else 281 else
282 svn upgrade "${wc_path}" &>/dev/null
254 svn cleanup "${wc_path}" 283 svn cleanup "${wc_path}" &>/dev/null
255 subversion_wc_info "${repo_uri}" || die "${ESVN}: unknown problem occurred while accessing working copy." 284 subversion_wc_info "${repo_uri}" || die "${ESVN}: unknown problem occurred while accessing working copy."
256 285
257 local esvn_up_freq= 286 local esvn_up_freq=
258 if [[ -n ${ESVN_UP_FREQ} ]]; then 287 if [[ -n ${ESVN_UP_FREQ} ]]; then
259 if [[ -n ${ESVN_UP_FREQ//[[:digit:]]} ]]; then 288 if [[ -n ${ESVN_UP_FREQ//[[:digit:]]} ]]; then
264 esvn_up_freq=no_update 293 esvn_up_freq=no_update
265 fi 294 fi
266 fi 295 fi
267 296
268 if [[ -z ${esvn_up_freq} ]]; then 297 if [[ -z ${esvn_up_freq} ]]; then
298 if [[ ${ESVN_WC_UUID} != $(subversion__svn_info "${repo_uri}" "Repository UUID") ]]; then
299 # UUID mismatch. Delete working copy and check out it again.
300 einfo "subversion recheck out start -->"
301 einfo " old UUID: ${ESVN_WC_UUID}"
302 einfo " new UUID: $(subversion__svn_info "${repo_uri}" "Repository UUID")"
303 einfo " repository: ${repo_uri}${revision:+@}${revision}"
304
305 rm -fr "${ESVN_PROJECT}" || die
306
307 debug-print "${FUNCNAME}: ${ESVN_FETCH_CMD} ${options} ${repo_uri}"
308
309 mkdir -m 775 -p "${ESVN_PROJECT}" || die "${ESVN}: can't mkdir ${ESVN_PROJECT}."
310 cd "${ESVN_PROJECT}" || die "${ESVN}: can't chdir to ${ESVN_PROJECT}"
311 if [[ -n "${ESVN_USER}" ]]; then
312 ${ESVN_FETCH_CMD} ${options} --username "${ESVN_USER}" --password "${ESVN_PASSWORD}" "${repo_uri}" || die "${ESVN}: can't fetch to ${wc_path} from ${repo_uri}."
313 else
314 ${ESVN_FETCH_CMD} ${options} "${repo_uri}" || die "${ESVN}: can't fetch to ${wc_path} from ${repo_uri}."
315 fi
269 if [[ ${ESVN_WC_URL} != $(subversion__get_repository_uri "${repo_uri}") ]]; then 316 elif [[ ${ESVN_WC_URL} != $(subversion__get_repository_uri "${repo_uri}") ]]; then
270 einfo "subversion switch start -->" 317 einfo "subversion switch start -->"
271 einfo " old repository: ${ESVN_WC_URL}@${ESVN_WC_REVISION}" 318 einfo " old repository: ${ESVN_WC_URL}@${ESVN_WC_REVISION}"
272 einfo " new repository: ${repo_uri}${revision:+@}${revision}" 319 einfo " new repository: ${repo_uri}${revision:+@}${revision}"
273 320
274 debug-print "${FUNCNAME}: ${ESVN_SWITCH_CMD} ${options} ${repo_uri}" 321 debug-print "${FUNCNAME}: ${ESVN_SWITCH_CMD} ${options} ${repo_uri}"
294 fi 341 fi
295 fi 342 fi
296 fi 343 fi
297 fi 344 fi
298 345
346 if [[ -n "${ESVN_UMASK}" ]]; then
347 eumask_pop
348 fi
349
299 einfo " working copy: ${wc_path}" 350 einfo " working copy: ${wc_path}"
300 351
301 if ! has "export" ${ESVN_RESTRICT}; then 352 if ! has "export" ${ESVN_RESTRICT}; then
302 cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}" 353 cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}"
303 354
308 #* "svn export" has a bug. see http://bugs.gentoo.org/119236 359 #* "svn export" has a bug. see http://bugs.gentoo.org/119236
309 #* svn export . "${S}" || die "${ESVN}: can't export to ${S}." 360 #* svn export . "${S}" || die "${ESVN}: can't export to ${S}."
310 rsync -rlpgo --exclude=".svn/" . "${S}" || die "${ESVN}: can't export to ${S}." 361 rsync -rlpgo --exclude=".svn/" . "${S}" || die "${ESVN}: can't export to ${S}."
311 fi 362 fi
312 363
364 popd >/dev/null
313 echo 365 echo
314} 366}
315 367
316# @FUNCTION: subversion_bootstrap 368# @FUNCTION: subversion_bootstrap
317# @DESCRIPTION: 369# @DESCRIPTION:
322 fi 374 fi
323 375
324 cd "${S}" 376 cd "${S}"
325 377
326 if [[ -n ${ESVN_PATCHES} ]]; then 378 if [[ -n ${ESVN_PATCHES} ]]; then
379 local patch fpatch
327 einfo "apply patches -->" 380 einfo "apply patches -->"
328
329 local patch fpatch
330
331 for patch in ${ESVN_PATCHES}; do 381 for patch in ${ESVN_PATCHES}; do
332 if [[ -f ${patch} ]]; then 382 if [[ -f ${patch} ]]; then
333 epatch "${patch}" 383 epatch "${patch}"
334
335 else 384 else
336 for fpatch in ${FILESDIR}/${patch}; do 385 for fpatch in ${FILESDIR}/${patch}; do
337 if [[ -f ${fpatch} ]]; then 386 if [[ -f ${fpatch} ]]; then
338 epatch "${fpatch}" 387 epatch "${fpatch}"
339
340 else 388 else
341 die "${ESVN}: ${patch} not found" 389 die "${ESVN}: ${patch} not found"
342
343 fi 390 fi
344 done 391 done
345
346 fi 392 fi
347 done 393 done
348
349 echo 394 echo
350 fi 395 fi
351 396
352 if [[ -n ${ESVN_BOOTSTRAP} ]]; then 397 if [[ -n ${ESVN_BOOTSTRAP} ]]; then
353 einfo "begin bootstrap -->" 398 einfo "begin bootstrap -->"
354
355 if [[ -f ${ESVN_BOOTSTRAP} && -x ${ESVN_BOOTSTRAP} ]]; then 399 if [[ -f ${ESVN_BOOTSTRAP} && -x ${ESVN_BOOTSTRAP} ]]; then
356 einfo " bootstrap with a file: ${ESVN_BOOTSTRAP}" 400 einfo " bootstrap with a file: ${ESVN_BOOTSTRAP}"
357 eval "./${ESVN_BOOTSTRAP}" || die "${ESVN}: can't execute ESVN_BOOTSTRAP." 401 eval "./${ESVN_BOOTSTRAP}" || die "${ESVN}: can't execute ESVN_BOOTSTRAP."
358
359 else 402 else
360 einfo " bootstrap with command: ${ESVN_BOOTSTRAP}" 403 einfo " bootstrap with command: ${ESVN_BOOTSTRAP}"
361 eval "${ESVN_BOOTSTRAP}" || die "${ESVN}: can't eval ESVN_BOOTSTRAP." 404 eval "${ESVN_BOOTSTRAP}" || die "${ESVN}: can't eval ESVN_BOOTSTRAP."
362
363 fi 405 fi
364 fi 406 fi
365} 407}
366 408
367# @FUNCTION: subversion_src_unpack 409# @FUNCTION: subversion_src_unpack
368# @DESCRIPTION: 410# @DESCRIPTION:
369# default src_unpack. fetch and bootstrap. 411# Default src_unpack. Fetch and, in older EAPIs, bootstrap.
370subversion_src_unpack() { 412subversion_src_unpack() {
371 subversion_fetch || die "${ESVN}: unknown problem occurred in subversion_fetch." 413 subversion_fetch || die "${ESVN}: unknown problem occurred in subversion_fetch."
414 if has "${EAPI:-0}" 0 1; then
415 subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap."
416 fi
417}
418
419# @FUNCTION: subversion_src_prepare
420# @DESCRIPTION:
421# Default src_prepare. Bootstrap.
422subversion_src_prepare() {
372 subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap." 423 subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap."
373} 424}
374 425
375# @FUNCTION: subversion_wc_info 426# @FUNCTION: subversion_wc_info
376# @USAGE: [repo_uri] 427# @USAGE: [repo_uri]
407# 458#
408subversion__svn_info() { 459subversion__svn_info() {
409 local target="${1}" 460 local target="${1}"
410 local key="${2}" 461 local key="${2}"
411 462
412 env LC_ALL=C svn info "${target}" | grep -i "^${key}" | cut -d" " -f2- 463 env LC_ALL=C svn info ${options} --username "${ESVN_USER}" --password "${ESVN_PASSWORD}" "${target}" \
464 | grep -i "^${key}" \
465 | cut -d" " -f2-
413} 466}
414 467
415## -- subversion__get_repository_uri() --------------------------------------- # 468## -- subversion__get_repository_uri() --------------------------------------- #
416# 469#
417# param $1 - a repository URI. 470# param $1 - a repository URI.
418subversion__get_repository_uri() { 471subversion__get_repository_uri() {
419 local repo_uri="${1}" 472 local repo_uri="${1}"
420 473
421 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 474 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
422
423 if [[ -z ${repo_uri} ]]; then 475 if [[ -z ${repo_uri} ]]; then
424 die "${ESVN}: ESVN_REPO_URI (or specified URI) is empty." 476 die "${ESVN}: ESVN_REPO_URI (or specified URI) is empty."
425 fi 477 fi
426
427 # delete trailing slash 478 # delete trailing slash
428 if [[ -z ${repo_uri##*/} ]]; then 479 if [[ -z ${repo_uri##*/} ]]; then
429 repo_uri="${repo_uri%/}" 480 repo_uri="${repo_uri%/}"
430 fi 481 fi
431
432 repo_uri="${repo_uri%@*}" 482 repo_uri="${repo_uri%@*}"
433 483
434 echo "${repo_uri}" 484 echo "${repo_uri}"
435} 485}
436 486
448## -- subversion__get_peg_revision() ----------------------------------------- # 498## -- subversion__get_peg_revision() ----------------------------------------- #
449# 499#
450# param $1 - a repository URI. 500# param $1 - a repository URI.
451subversion__get_peg_revision() { 501subversion__get_peg_revision() {
452 local repo_uri="${1}" 502 local repo_uri="${1}"
503 local peg_rev=
453 504
454 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 505 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
455
456 # repo_uri has peg revision ? 506 # repo_uri has peg revision?
457 if [[ ${repo_uri} != *@* ]]; then 507 if [[ ${repo_uri} = *@* ]]; then
508 peg_rev="${repo_uri##*@}"
509 debug-print "${FUNCNAME}: peg_rev = ${peg_rev}"
510 else
458 debug-print "${FUNCNAME}: repo_uri does not have a peg revision." 511 debug-print "${FUNCNAME}: repo_uri does not have a peg revision."
459 fi 512 fi
460
461 local peg_rev=
462 [[ ${repo_uri} = *@* ]] && peg_rev="${repo_uri##*@}"
463
464 debug-print "${FUNCNAME}: peg_rev = ${peg_rev}"
465 513
466 echo "${peg_rev}" 514 echo "${peg_rev}"
467} 515}
468 516
469# @FUNCTION: subversion_pkg_preinst 517# @FUNCTION: subversion_pkg_preinst
472# Log the svn revision of source code. Doing this in pkg_preinst because we 520# Log the svn revision of source code. Doing this in pkg_preinst because we
473# want the logs to stick around if packages are uninstalled without messing with 521# want the logs to stick around if packages are uninstalled without messing with
474# config protection. 522# config protection.
475subversion_pkg_preinst() { 523subversion_pkg_preinst() {
476 local pkgdate=$(date "+%Y%m%d %H:%M:%S") 524 local pkgdate=$(date "+%Y%m%d %H:%M:%S")
477 subversion_wc_info "${1:-${ESVN_REPO_URI}}" 525 subversion_wc_info "${1}"
478 if [[ -n ${ESCM_LOGDIR} ]]; then 526 if [[ -n ${ESCM_LOGDIR} ]]; then
479 local dir="${ROOT}/${ESCM_LOGDIR}/${CATEGORY}" 527 local dir="${ROOT}/${ESCM_LOGDIR}/${CATEGORY}"
480 if [[ ! -d ${dir} ]]; then 528 if [[ ! -d ${dir} ]]; then
481 mkdir -p "${dir}" || \ 529 mkdir -p "${dir}" || eerror "Failed to create '${dir}' for logging svn revision"
482 eerror "Failed to create '${dir}' for logging svn revision to '${PORTDIR_SCM}'"
483 fi 530 fi
484 local logmessage="svn: ${pkgdate} - ${PF}:${SLOT} was merged at revision ${ESVN_WC_REVISION}" 531 local logmessage="svn: ${pkgdate} - ${PF}:${SLOT} was merged at revision ${ESVN_WC_REVISION}"
485 if [[ -d ${dir} ]]; then 532 if [[ -d ${dir} ]]; then
486 echo "${logmessage}" >> "${dir}/${PN}.log" 533 echo "${logmessage}" >>"${dir}/${PN}.log"
487 else 534 else
488 eerror "Could not log the message '${logmessage}' to '${dir}/${PN}.log'" 535 eerror "Could not log the message '${logmessage}' to '${dir}/${PN}.log'"
489 fi 536 fi
490 fi 537 fi
491} 538}

Legend:
Removed from v.1.63  
changed lines
  Added in v.1.78

  ViewVC Help
Powered by ViewVC 1.1.20