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

Diff of /eclass/subversion.eclass

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

Revision 1.50 Revision 1.75
1# Copyright 1999-2008 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.50 2008/02/20 20:36:30 zlin Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.75 2012/02/21 18:03:49 jlec 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# Bo Ørsted Andresen <zlin@gentoo.org>
9# 9# Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
10# @AUTHOR:
10# Original Author: Akinori Hattori <hattya@gentoo.org> 11# Original Author: Akinori Hattori <hattya@gentoo.org>
11#
12# @BLURB: The subversion eclass is written to fetch software sources from subversion repositories 12# @BLURB: The subversion eclass is written to fetch software sources from subversion repositories
13# @DESCRIPTION: 13# @DESCRIPTION:
14# The subversion eclass provides functions to fetch, patch and bootstrap 14# The subversion eclass provides functions to fetch, patch and bootstrap
15# software sources from subversion repositories. 15# software sources from subversion repositories.
16#
17# You must define the ESVN_REPO_URI variable before inheriting this eclass.
18 16
19inherit eutils 17inherit eutils
20 18
21ESVN="${ECLASS}" 19ESVN="${ECLASS}"
22 20
21case "${EAPI:-0}" in
22 0|1)
23EXPORT_FUNCTIONS src_unpack pkg_preinst 23 EXPORT_FUNCTIONS src_unpack pkg_preinst
24 ;;
25 *)
26 EXPORT_FUNCTIONS src_unpack src_prepare pkg_preinst
27 ;;
28esac
24 29
25DESCRIPTION="Based on the ${ECLASS} eclass" 30DESCRIPTION="Based on the ${ECLASS} eclass"
26 31
27DEPEND="dev-util/subversion 32SUBVERSION_DEPEND="dev-vcs/subversion
28 net-misc/rsync" 33 net-misc/rsync"
34
35if [[ -z "${ESVN_DISABLE_DEPENDENCIES}" ]]; then
36 DEPEND="${SUBVERSION_DEPEND}"
37fi
29 38
30# @ECLASS-VARIABLE: ESVN_STORE_DIR 39# @ECLASS-VARIABLE: ESVN_STORE_DIR
31# @DESCRIPTION: 40# @DESCRIPTION:
32# subversion sources store directory. Users may override this in /etc/make.conf 41# subversion sources store directory. Users may override this in /etc/make.conf
33[[ -z ${ESVN_STORE_DIR} ]] && ESVN_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src" 42[[ -z ${ESVN_STORE_DIR} ]] && ESVN_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src"
… …
76# to a specific revision 85# to a specific revision
77# 86#
78# Note: This should never be set in an ebuild! 87# Note: This should never be set in an ebuild!
79ESVN_REVISION="${ESVN_REVISION:-}" 88ESVN_REVISION="${ESVN_REVISION:-}"
80 89
90# @ECLASS-VARIABLE: ESVN_USER
91# @DESCRIPTION:
92# User name
93ESVN_USER="${ESVN_USER:-}"
94
95# @ECLASS-VARIABLE: ESVN_PASSWORD
96# @DESCRIPTION:
97# Password
98ESVN_PASSWORD="${ESVN_PASSWORD:-}"
99
81# @ECLASS-VARIABLE: ESVN_PROJECT 100# @ECLASS-VARIABLE: ESVN_PROJECT
82# @DESCRIPTION: 101# @DESCRIPTION:
83# project name of your ebuild (= name space) 102# project name of your ebuild (= name space)
84# 103#
85# subversion eclass will check out the subversion repository like: 104# subversion eclass will check out the subversion repository like:
… …
122# restrict. 141# restrict.
123# export) 142# export)
124# don't export the working copy to S. 143# don't export the working copy to S.
125ESVN_RESTRICT="${ESVN_RESTRICT:-}" 144ESVN_RESTRICT="${ESVN_RESTRICT:-}"
126 145
146# @ECLASS-VARIABLE: ESVN_DISABLE_DEPENDENCIES
147# @DESCRIPTION:
148# Set this variable to a non-empty value to disable the automatic inclusion of
149# Subversion in dependencies.
150ESVN_DISABLE_DEPENDENCIES="${ESVN_DISABLE_DEPENDENCIES:-}"
151
127# @ECLASS-VARIABLE: ESVN_OFFLINE 152# @ECLASS-VARIABLE: ESVN_OFFLINE
128# @DESCRIPTION: 153# @DESCRIPTION:
129# Set this variable to a non-empty value to disable the automatic updating of 154# Set this variable to a non-empty value to disable the automatic updating of
130# an svn source tree. This is intended to be set outside the subversion source 155# an svn source tree. This is intended to be set outside the subversion source
131# tree by users. 156# tree by users.
132ESVN_OFFLINE="${ESVN_OFFLINE:-${ESCM_OFFLINE}}" 157ESVN_OFFLINE="${ESVN_OFFLINE:-${ESCM_OFFLINE}}"
158
159# @ECLASS-VARIABLE: ESVN_UMASK
160# @DESCRIPTION:
161# Set this variable to a custom umask. This is intended to be set by users.
162# By setting this to something like 002, it can make life easier for people
163# who do development as non-root (but are in the portage group), and then
164# switch over to building with FEATURES=userpriv. Or vice-versa. Shouldn't
165# be a security issue here as anyone who has portage group write access
166# already can screw the system over in more creative ways.
167ESVN_UMASK="${ESVN_UMASK:-${EVCS_UMASK}}"
168
169# @ECLASS-VARIABLE: ESVN_UP_FREQ
170# @DESCRIPTION:
171# Set the minimum number of hours between svn up'ing in any given svn module. This is particularly
172# useful for split KDE ebuilds where we want to ensure that all submodules are compiled for the same
173# revision. It should also be kept user overrideable.
174ESVN_UP_FREQ="${ESVN_UP_FREQ:=}"
133 175
134# @ECLASS-VARIABLE: ESCM_LOGDIR 176# @ECLASS-VARIABLE: ESCM_LOGDIR
135# @DESCRIPTION: 177# @DESCRIPTION:
136# User configuration variable. If set to a path such as e.g. /var/log/scm any 178# User configuration variable. If set to a path such as e.g. /var/log/scm any
137# package inheriting from subversion.eclass will record svn revision to 179# package inheriting from subversion.eclass will record svn revision to
… …
151subversion_fetch() { 193subversion_fetch() {
152 local repo_uri="$(subversion__get_repository_uri "${1:-${ESVN_REPO_URI}}")" 194 local repo_uri="$(subversion__get_repository_uri "${1:-${ESVN_REPO_URI}}")"
153 local revision="$(subversion__get_peg_revision "${1:-${ESVN_REPO_URI}}")" 195 local revision="$(subversion__get_peg_revision "${1:-${ESVN_REPO_URI}}")"
154 local S_dest="${2}" 196 local S_dest="${2}"
155 197
198 if [[ -z ${repo_uri} ]]; then
199 die "${ESVN}: ESVN_REPO_URI (or specified URI) is empty."
200 fi
201
156 [[ -n "${ESVN_REVISION}" ]] && revision="${ESVN_REVISION}" 202 [[ -n "${ESVN_REVISION}" ]] && revision="${ESVN_REVISION}"
157 203
158 # check for the protocol 204 # check for the protocol
159 local protocol="${repo_uri%%:*}" 205 local protocol="${repo_uri%%:*}"
160 206
161 case "${protocol}" in 207 case "${protocol}" in
162 http|https) 208 http|https)
163 if built_with_use dev-util/subversion nowebdav; then 209 if ! built_with_use -o dev-vcs/subversion webdav-neon webdav-serf; then
164 echo 210 echo
165 eerror "In order to emerge this package, you need to" 211 eerror "In order to emerge this package, you need to"
166 eerror "re-emerge subversion with USE=-nowebdav" 212 eerror "reinstall Subversion with support for WebDAV."
213 eerror "Subversion requires either Neon or Serf to support WebDAV."
167 echo 214 echo
168 die "${ESVN}: please run 'USE=-nowebdav emerge subversion'" 215 die "${ESVN}: reinstall Subversion with support for WebDAV."
169 fi 216 fi
170 ;; 217 ;;
171 svn|svn+ssh) 218 svn|svn+ssh)
172 ;; 219 ;;
173 *) 220 *)
… …
176 esac 223 esac
177 224
178 addread "/etc/subversion" 225 addread "/etc/subversion"
179 addwrite "${ESVN_STORE_DIR}" 226 addwrite "${ESVN_STORE_DIR}"
180 227
228 if [[ -n "${ESVN_UMASK}" ]]; then
229 eumask_push "${ESVN_UMASK}"
230 fi
231
181 if [[ ! -d ${ESVN_STORE_DIR} ]]; then 232 if [[ ! -d ${ESVN_STORE_DIR} ]]; then
182 debug-print "${FUNCNAME}: initial checkout. creating subversion directory" 233 debug-print "${FUNCNAME}: initial checkout. creating subversion directory"
183 mkdir -p "${ESVN_STORE_DIR}" || die "${ESVN}: can't mkdir ${ESVN_STORE_DIR}." 234 mkdir -m 775 -p "${ESVN_STORE_DIR}" || die "${ESVN}: can't mkdir ${ESVN_STORE_DIR}."
184 fi 235 fi
185 236
186 cd "${ESVN_STORE_DIR}" || die "${ESVN}: can't chdir to ${ESVN_STORE_DIR}" 237 pushd "${ESVN_STORE_DIR}" > /dev/null || die "${ESVN}: can't chdir to ${ESVN_STORE_DIR}"
187 238
188 local wc_path="$(subversion__get_wc_path "${repo_uri}")" 239 local wc_path="$(subversion__get_wc_path "${repo_uri}")"
189 local options="${ESVN_OPTIONS} --config-dir ${ESVN_STORE_DIR}/.subversion" 240 local options="${ESVN_OPTIONS} --config-dir ${ESVN_STORE_DIR}/.subversion"
190 241
191 [[ -n "${revision}" ]] && options="${options} -r ${revision}" 242 [[ -n "${revision}" ]] && options="${options} -r ${revision}"
… …
193 if [[ "${ESVN_OPTIONS}" = *-r* ]]; then 244 if [[ "${ESVN_OPTIONS}" = *-r* ]]; then
194 ewarn "\${ESVN_OPTIONS} contains -r, this usage is unsupported. Please" 245 ewarn "\${ESVN_OPTIONS} contains -r, this usage is unsupported. Please"
195 ewarn "see \${ESVN_REPO_URI}" 246 ewarn "see \${ESVN_REPO_URI}"
196 fi 247 fi
197 248
249 if has_version ">=dev-vcs/subversion-1.6.0"; then
250 options="${options} --config-option=config:auth:password-stores="
251 fi
252
198 debug-print "${FUNCNAME}: wc_path = \"${wc_path}\"" 253 debug-print "${FUNCNAME}: wc_path = \"${wc_path}\""
199 debug-print "${FUNCNAME}: ESVN_OPTIONS = \"${ESVN_OPTIONS}\"" 254 debug-print "${FUNCNAME}: ESVN_OPTIONS = \"${ESVN_OPTIONS}\""
200 debug-print "${FUNCNAME}: options = \"${options}\"" 255 debug-print "${FUNCNAME}: options = \"${options}\""
201 256
202 if [[ ! -d ${wc_path}/.svn ]]; then 257 if [[ ! -d ${wc_path}/.svn ]]; then
258 if [[ -n ${ESVN_OFFLINE} ]]; then
259 ewarn "ESVN_OFFLINE cannot be used when there is no existing checkout."
260 fi
203 # first check out 261 # first check out
204 einfo "subversion check out start -->" 262 einfo "subversion check out start -->"
205 einfo " repository: ${repo_uri}${revision:+@}${revision}" 263 einfo " repository: ${repo_uri}${revision:+@}${revision}"
206 264
207 debug-print "${FUNCNAME}: ${ESVN_FETCH_CMD} ${options} ${repo_uri}" 265 debug-print "${FUNCNAME}: ${ESVN_FETCH_CMD} ${options} ${repo_uri}"
208 266
209 mkdir -p "${ESVN_PROJECT}" || die "${ESVN}: can't mkdir ${ESVN_PROJECT}." 267 mkdir -m 775 -p "${ESVN_PROJECT}" || die "${ESVN}: can't mkdir ${ESVN_PROJECT}."
210 cd "${ESVN_PROJECT}" || die "${ESVN}: can't chdir to ${ESVN_PROJECT}" 268 cd "${ESVN_PROJECT}" || die "${ESVN}: can't chdir to ${ESVN_PROJECT}"
269 if [[ -n "${ESVN_USER}" ]]; then
270 ${ESVN_FETCH_CMD} ${options} --username "${ESVN_USER}" --password "${ESVN_PASSWORD}" "${repo_uri}" || die "${ESVN}: can't fetch to ${wc_path} from ${repo_uri}."
271 else
211 ${ESVN_FETCH_CMD} ${options} "${repo_uri}" || die "${ESVN}: can't fetch from ${repo_uri}." 272 ${ESVN_FETCH_CMD} ${options} "${repo_uri}" || die "${ESVN}: can't fetch to ${wc_path} from ${repo_uri}."
273 fi
212 274
213 elif [[ -n ${ESVN_OFFLINE} ]]; then 275 elif [[ -n ${ESVN_OFFLINE} ]]; then
276 svn upgrade "${wc_path}" &>/dev/null
277 svn cleanup "${wc_path}" &>/dev/null
214 subversion_wc_info "${repo_uri}" || die "${ESVN}: unknown problem occurred while accessing working copy." 278 subversion_wc_info "${repo_uri}" || die "${ESVN}: unknown problem occurred while accessing working copy."
215 if [[ -n ${ESVN_REVISION} && ${ESVN_REVISION} != ${ESVN_WC_REVISION} ]]; then 279 if [[ -n ${ESVN_REVISION} && ${ESVN_REVISION} != ${ESVN_WC_REVISION} ]]; then
216 die "${ESVN}: You requested off-line updating and revision ${ESVN_REVISION} but only revision ${ESVN_WC_REVISION} is available locally." 280 die "${ESVN}: You requested off-line updating and revision ${ESVN_REVISION} but only revision ${ESVN_WC_REVISION} is available locally."
217 fi 281 fi
218 einfo "Fetching disabled: Using existing repository copy" 282 einfo "Fetching disabled: Using existing repository copy at revision ${ESVN_WC_REVISION}."
219 else 283 else
284 svn upgrade "${wc_path}" &>/dev/null
285 svn cleanup "${wc_path}" &>/dev/null
220 subversion_wc_info "${repo_uri}" || die "${ESVN}: unknown problem occurred while accessing working copy." 286 subversion_wc_info "${repo_uri}" || die "${ESVN}: unknown problem occurred while accessing working copy."
221 287
288 local esvn_up_freq=
289 if [[ -n ${ESVN_UP_FREQ} ]]; then
290 if [[ -n ${ESVN_UP_FREQ//[[:digit:]]} ]]; then
291 die "${ESVN}: ESVN_UP_FREQ must be an integer value corresponding to the minimum number of hours between svn up."
292 elif [[ -z $(find "${wc_path}/.svn/entries" -mmin "+$((ESVN_UP_FREQ*60))") ]]; then
293 einfo "Fetching disabled since ${ESVN_UP_FREQ} hours has not passed since last update."
294 einfo "Using existing repository copy at revision ${ESVN_WC_REVISION}."
295 esvn_up_freq=no_update
296 fi
297 fi
298
299 if [[ -z ${esvn_up_freq} ]]; then
300 if [[ ${ESVN_WC_UUID} != $(subversion__svn_info "${repo_uri}" "Repository UUID") ]]; then
301 # UUID mismatch. Delete working copy and check out it again.
302 einfo "subversion recheck out start -->"
303 einfo " old UUID: ${ESVN_WC_UUID}"
304 einfo " new UUID: $(subversion__svn_info "${repo_uri}" "Repository UUID")"
305 einfo " repository: ${repo_uri}${revision:+@}${revision}"
306
307 rm -fr "${ESVN_PROJECT}" || die
308
309 debug-print "${FUNCNAME}: ${ESVN_FETCH_CMD} ${options} ${repo_uri}"
310
311 mkdir -m 775 -p "${ESVN_PROJECT}" || die "${ESVN}: can't mkdir ${ESVN_PROJECT}."
312 cd "${ESVN_PROJECT}" || die "${ESVN}: can't chdir to ${ESVN_PROJECT}"
313 if [[ -n "${ESVN_USER}" ]]; then
314 ${ESVN_FETCH_CMD} ${options} --username "${ESVN_USER}" --password "${ESVN_PASSWORD}" "${repo_uri}" || die "${ESVN}: can't fetch to ${wc_path} from ${repo_uri}."
315 else
316 ${ESVN_FETCH_CMD} ${options} "${repo_uri}" || die "${ESVN}: can't fetch to ${wc_path} from ${repo_uri}."
317 fi
222 if [[ ${ESVN_WC_URL} != $(subversion__get_repository_uri "${repo_uri}") ]]; then 318 elif [[ ${ESVN_WC_URL} != $(subversion__get_repository_uri "${repo_uri}") ]]; then
223 einfo "suversion switch start -->" 319 einfo "subversion switch start -->"
224 einfo " old repository: ${ESVN_WC_URL}@${ESVN_WC_REVISION}" 320 einfo " old repository: ${ESVN_WC_URL}@${ESVN_WC_REVISION}"
225 einfo " new repository: ${repo_uri}${revision:+@}${revision}" 321 einfo " new repository: ${repo_uri}${revision:+@}${revision}"
226 322
227 debug-print "${FUNCNAME}: ${ESVN_SWITCH_CMD} ${options} ${repo_uri}" 323 debug-print "${FUNCNAME}: ${ESVN_SWITCH_CMD} ${options} ${repo_uri}"
228 324
229 cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}" 325 cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}"
326 if [[ -n "${ESVN_USER}" ]]; then
327 ${ESVN_SWITCH_CMD} ${options} --username "${ESVN_USER}" --password "${ESVN_PASSWORD}" ${repo_uri} || die "${ESVN}: can't update ${wc_path} from ${repo_uri}."
328 else
230 ${ESVN_SWITCH_CMD} ${options} ${repo_uri} || die "${ESVN}: can't update from ${repo_uri}" 329 ${ESVN_SWITCH_CMD} ${options} ${repo_uri} || die "${ESVN}: can't update ${wc_path} from ${repo_uri}."
330 fi
231 else 331 else
232 # update working copy 332 # update working copy
233 einfo "subversion update start -->" 333 einfo "subversion update start -->"
234 einfo " repository: ${repo_uri}${revision:+@}${revision}" 334 einfo " repository: ${repo_uri}${revision:+@}${revision}"
235 335
236 debug-print "${FUNCNAME}: ${ESVN_UPDATE_CMD} ${options}" 336 debug-print "${FUNCNAME}: ${ESVN_UPDATE_CMD} ${options}"
237 337
238 cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}" 338 cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}"
339 if [[ -n "${ESVN_USER}" ]]; then
340 ${ESVN_UPDATE_CMD} ${options} --username "${ESVN_USER}" --password "${ESVN_PASSWORD}" || die "${ESVN}: can't update ${wc_path} from ${repo_uri}."
341 else
239 ${ESVN_UPDATE_CMD} ${options} || die "${ESVN}: can't update from ${repo_uri}." 342 ${ESVN_UPDATE_CMD} ${options} || die "${ESVN}: can't update ${wc_path} from ${repo_uri}."
343 fi
240 fi 344 fi
345 fi
346 fi
241 347
348 if [[ -n "${ESVN_UMASK}" ]]; then
349 eumask_pop
242 fi 350 fi
243 351
244 einfo " working copy: ${wc_path}" 352 einfo " working copy: ${wc_path}"
245 353
246 if ! has "export" ${ESVN_RESTRICT}; then 354 if ! has "export" ${ESVN_RESTRICT}; then
247 cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}" 355 cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}"
248 356
249 local S="${S}/${S_dest}" 357 local S="${S}/${S_dest}"
358 mkdir -p "${S}"
250 359
251 # export to the ${WORKDIR} 360 # export to the ${WORKDIR}
252 #* "svn export" has a bug. see http://bugs.gentoo.org/119236 361 #* "svn export" has a bug. see http://bugs.gentoo.org/119236
253 #* svn export . "${S}" || die "${ESVN}: can't export to ${S}." 362 #* svn export . "${S}" || die "${ESVN}: can't export to ${S}."
254 rsync -rlpgo --exclude=".svn/" . "${S}" || die "${ESVN}: can't export to ${S}." 363 rsync -rlpgo --exclude=".svn/" . "${S}" || die "${ESVN}: can't export to ${S}."
255 fi 364 fi
256 365
366 popd > /dev/null
367
257 echo 368 echo
258} 369}
259 370
260# @FUNCTION: subversion_bootstrap 371# @FUNCTION: subversion_bootstrap
261# @DESCRIPTION: 372# @DESCRIPTION:
… …
308 fi 419 fi
309} 420}
310 421
311# @FUNCTION: subversion_src_unpack 422# @FUNCTION: subversion_src_unpack
312# @DESCRIPTION: 423# @DESCRIPTION:
313# default src_unpack. fetch and bootstrap. 424# Default src_unpack. Fetch and, in older EAPIs, bootstrap.
314subversion_src_unpack() { 425subversion_src_unpack() {
315 subversion_fetch || die "${ESVN}: unknown problem occurred in subversion_fetch." 426 subversion_fetch || die "${ESVN}: unknown problem occurred in subversion_fetch."
427 if has "${EAPI:-0}" 0 1; then
428 subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap."
429 fi
430}
431
432# @FUNCTION: subversion_src_prepare
433# @DESCRIPTION:
434# Default src_prepare. Bootstrap.
435subversion_src_prepare() {
316 subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap." 436 subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap."
317} 437}
318 438
319# @FUNCTION: subversion_wc_info 439# @FUNCTION: subversion_wc_info
320# @USAGE: [repo_uri] 440# @USAGE: [repo_uri]
… …
323# Get svn info for the specified repo_uri. The default repo_uri is ESVN_REPO_URI. 443# Get svn info for the specified repo_uri. The default repo_uri is ESVN_REPO_URI.
324# 444#
325# The working copy information on the specified repository URI are set to 445# The working copy information on the specified repository URI are set to
326# ESVN_WC_* variables. 446# ESVN_WC_* variables.
327subversion_wc_info() { 447subversion_wc_info() {
328 local repo_uri="$(subversion__get_repository_uri "${1}")" 448 local repo_uri="$(subversion__get_repository_uri "${1:-${ESVN_REPO_URI}}")"
329 local wc_path="$(subversion__get_wc_path "${repo_uri}")" 449 local wc_path="$(subversion__get_wc_path "${repo_uri}")"
330 450
331 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 451 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
332 debug-print "${FUNCNAME}: wc_path = ${wc_path}" 452 debug-print "${FUNCNAME}: wc_path = ${wc_path}"
333 453
… …
351# 471#
352subversion__svn_info() { 472subversion__svn_info() {
353 local target="${1}" 473 local target="${1}"
354 local key="${2}" 474 local key="${2}"
355 475
476 env LC_ALL=C svn info \
477 ${options} --username "${ESVN_USER}" --password "${ESVN_PASSWORD}" \
356 env LC_ALL=C svn info "${target}" | grep -i "^${key}" | cut -d" " -f2- 478 "${target}" | grep -i "^${key}" | cut -d" " -f2-
357} 479}
358 480
359## -- subversion__get_repository_uri() --------------------------------------- # 481## -- subversion__get_repository_uri() --------------------------------------- #
360# 482#
361# param $1 - a repository URI. 483# param $1 - a repository URI.
362subversion__get_repository_uri() { 484subversion__get_repository_uri() {
363 local repo_uri="${1}" 485 local repo_uri="${1}"
364 486
365 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 487 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
366 488
367 if [[ -z ${repo_uri} ]]; then 489 if [[ -z ${repo_uri} ]]; then
368 die "${ESVN}: ESVN_REPO_URI (or specified URI) is empty." 490 die "${ESVN}: ESVN_REPO_URI (or specified URI) is empty."
… …
409 531
410 echo "${peg_rev}" 532 echo "${peg_rev}"
411} 533}
412 534
413# @FUNCTION: subversion_pkg_preinst 535# @FUNCTION: subversion_pkg_preinst
536# @USAGE: [repo_uri]
414# @DESCRIPTION: 537# @DESCRIPTION:
415# Log the svn revision of source code. Doing this in pkg_preinst because we 538# Log the svn revision of source code. Doing this in pkg_preinst because we
416# want the logs to stick around if packages are uninstalled without messing with 539# want the logs to stick around if packages are uninstalled without messing with
417# config protection. 540# config protection.
418subversion_pkg_preinst() { 541subversion_pkg_preinst() {
419 local pkgdate=$(date "+%Y%m%d %H:%M:%S") 542 local pkgdate=$(date "+%Y%m%d %H:%M:%S")
420 subversion_wc_info 543 subversion_wc_info "${1:-${ESVN_REPO_URI}}"
421 if [[ -n ${ESCM_LOGDIR} ]]; then 544 if [[ -n ${ESCM_LOGDIR} ]]; then
422 local dir="${ROOT}/${ESCM_LOGDIR}/${CATEGORY}" 545 local dir="${ROOT}/${ESCM_LOGDIR}/${CATEGORY}"
423 if [[ ! -d ${dir} ]]; then 546 if [[ ! -d ${dir} ]]; then
424 mkdir -p "${dir}" || \ 547 mkdir -p "${dir}" || \
425 eerror "Failed to create '${dir}' for logging svn revision to '${PORTDIR_SCM}'" 548 eerror "Failed to create '${dir}' for logging svn revision to '${PORTDIR_SCM}'"
Legend:
Removed from v.1.50  
changed lines
  Added in v.1.75
  ViewVC Help
Powered by ViewVC 1.1.20