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

Diff of /eclass/subversion.eclass

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

Revision 1.59 Revision 1.77
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.59 2008/05/15 13:27:40 zlin Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.77 2012/06/10 10:08:36 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#
10# Original Author: Akinori Hattori <hattya@gentoo.org> 9# Original Author: Akinori Hattori <hattya@gentoo.org>
11#
12# @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
13# @DESCRIPTION: 11# @DESCRIPTION:
14# The subversion eclass provides functions to fetch, patch and bootstrap 12# The subversion eclass provides functions to fetch, patch and bootstrap
15# software sources from subversion repositories. 13# software sources from subversion repositories.
16 14
17inherit eutils 15inherit eutils
18 16
19ESVN="${ECLASS}" 17ESVN="${ECLASS}"
20 18
19case "${EAPI:-0}" in
20 0|1)
21EXPORT_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
22 27
23DESCRIPTION="Based on the ${ECLASS} eclass" 28DESCRIPTION="Based on the ${ECLASS} eclass"
24 29
25DEPEND="dev-util/subversion 30SUBVERSION_DEPEND="dev-vcs/subversion
26 net-misc/rsync" 31 net-misc/rsync"
32
33if [[ -z "${ESVN_DISABLE_DEPENDENCIES}" ]]; then
34 DEPEND="${SUBVERSION_DEPEND}"
35fi
27 36
28# @ECLASS-VARIABLE: ESVN_STORE_DIR 37# @ECLASS-VARIABLE: ESVN_STORE_DIR
29# @DESCRIPTION: 38# @DESCRIPTION:
30# 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
31[[ -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"
… …
74# to a specific revision 83# to a specific revision
75# 84#
76# Note: This should never be set in an ebuild! 85# Note: This should never be set in an ebuild!
77ESVN_REVISION="${ESVN_REVISION:-}" 86ESVN_REVISION="${ESVN_REVISION:-}"
78 87
88# @ECLASS-VARIABLE: ESVN_USER
89# @DESCRIPTION:
90# User name
91ESVN_USER="${ESVN_USER:-}"
92
93# @ECLASS-VARIABLE: ESVN_PASSWORD
94# @DESCRIPTION:
95# Password
96ESVN_PASSWORD="${ESVN_PASSWORD:-}"
97
79# @ECLASS-VARIABLE: ESVN_PROJECT 98# @ECLASS-VARIABLE: ESVN_PROJECT
80# @DESCRIPTION: 99# @DESCRIPTION:
81# project name of your ebuild (= name space) 100# project name of your ebuild (= name space)
82# 101#
83# subversion eclass will check out the subversion repository like: 102# subversion eclass will check out the subversion repository like:
… …
120# restrict. 139# restrict.
121# export) 140# export)
122# don't export the working copy to S. 141# don't export the working copy to S.
123ESVN_RESTRICT="${ESVN_RESTRICT:-}" 142ESVN_RESTRICT="${ESVN_RESTRICT:-}"
124 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
125# @ECLASS-VARIABLE: ESVN_OFFLINE 150# @ECLASS-VARIABLE: ESVN_OFFLINE
126# @DESCRIPTION: 151# @DESCRIPTION:
127# 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
128# 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
129# tree by users. 154# tree by users.
130ESVN_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}}"
131 166
132# @ECLASS-VARIABLE: ESVN_UP_FREQ 167# @ECLASS-VARIABLE: ESVN_UP_FREQ
133# @DESCRIPTION: 168# @DESCRIPTION:
134# 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
135# 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
… …
164 199
165 [[ -n "${ESVN_REVISION}" ]] && revision="${ESVN_REVISION}" 200 [[ -n "${ESVN_REVISION}" ]] && revision="${ESVN_REVISION}"
166 201
167 # check for the protocol 202 # check for the protocol
168 local protocol="${repo_uri%%:*}" 203 local protocol="${repo_uri%%:*}"
169
170 case "${protocol}" in 204 case "${protocol}" in
171 http|https) 205 http|https)
172 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
173 built_with_use --missing false dev-util/subversion nowebdav ; then
174 echo 207 echo
175 eerror "In order to emerge this package, you need to" 208 eerror "In order to emerge this package, you need to"
176 eerror "reinstall Subversion with support for WebDAV." 209 eerror "reinstall Subversion with support for WebDAV."
177 eerror "Subversion requires either Neon or Serf to support WebDAV." 210 eerror "Subversion requires either Neon or Serf to support WebDAV."
178 echo 211 echo
… …
187 esac 220 esac
188 221
189 addread "/etc/subversion" 222 addread "/etc/subversion"
190 addwrite "${ESVN_STORE_DIR}" 223 addwrite "${ESVN_STORE_DIR}"
191 224
225 if [[ -n "${ESVN_UMASK}" ]]; then
226 eumask_push "${ESVN_UMASK}"
227 fi
228
192 if [[ ! -d ${ESVN_STORE_DIR} ]]; then 229 if [[ ! -d ${ESVN_STORE_DIR} ]]; then
193 debug-print "${FUNCNAME}: initial checkout. creating subversion directory" 230 debug-print "${FUNCNAME}: initial checkout. creating subversion directory"
194 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}."
195 fi 232 fi
196 233
197 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}"
198 235
199 local wc_path="$(subversion__get_wc_path "${repo_uri}")" 236 local wc_path="$(subversion__get_wc_path "${repo_uri}")"
200 local options="${ESVN_OPTIONS} --config-dir ${ESVN_STORE_DIR}/.subversion" 237 local options="${ESVN_OPTIONS} --config-dir ${ESVN_STORE_DIR}/.subversion"
201 238
202 [[ -n "${revision}" ]] && options="${options} -r ${revision}" 239 [[ -n "${revision}" ]] && options="${options} -r ${revision}"
… …
204 if [[ "${ESVN_OPTIONS}" = *-r* ]]; then 241 if [[ "${ESVN_OPTIONS}" = *-r* ]]; then
205 ewarn "\${ESVN_OPTIONS} contains -r, this usage is unsupported. Please" 242 ewarn "\${ESVN_OPTIONS} contains -r, this usage is unsupported. Please"
206 ewarn "see \${ESVN_REPO_URI}" 243 ewarn "see \${ESVN_REPO_URI}"
207 fi 244 fi
208 245
246 if has_version ">=dev-vcs/subversion-1.6.0"; then
247 options="${options} --config-option=config:auth:password-stores="
248 fi
249
209 debug-print "${FUNCNAME}: wc_path = \"${wc_path}\"" 250 debug-print "${FUNCNAME}: wc_path = \"${wc_path}\""
210 debug-print "${FUNCNAME}: ESVN_OPTIONS = \"${ESVN_OPTIONS}\"" 251 debug-print "${FUNCNAME}: ESVN_OPTIONS = \"${ESVN_OPTIONS}\""
211 debug-print "${FUNCNAME}: options = \"${options}\"" 252 debug-print "${FUNCNAME}: options = \"${options}\""
212 253
213 if [[ ! -d ${wc_path}/.svn ]]; then 254 if [[ ! -d ${wc_path}/.svn ]]; then
214 if [[ -n ${ESVN_OFFLINE} ]]; then 255 if [[ -n ${ESVN_OFFLINE} ]]; then
215 ewarn "ESVN_OFFLINE cannot be used when the there is no existing checkout." 256 ewarn "ESVN_OFFLINE cannot be used when there is no existing checkout."
216 fi 257 fi
217 # first check out 258 # first check out
218 einfo "subversion check out start -->" 259 einfo "subversion check out start -->"
219 einfo " repository: ${repo_uri}${revision:+@}${revision}" 260 einfo " repository: ${repo_uri}${revision:+@}${revision}"
220 261
221 debug-print "${FUNCNAME}: ${ESVN_FETCH_CMD} ${options} ${repo_uri}" 262 debug-print "${FUNCNAME}: ${ESVN_FETCH_CMD} ${options} ${repo_uri}"
222 263
223 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}."
224 cd "${ESVN_PROJECT}" || die "${ESVN}: can't chdir to ${ESVN_PROJECT}" 265 cd "${ESVN_PROJECT}" || die "${ESVN}: can't chdir to ${ESVN_PROJECT}"
266 if [[ -n "${ESVN_USER}" ]]; then
267 ${ESVN_FETCH_CMD} ${options} --username "${ESVN_USER}" --password "${ESVN_PASSWORD}" "${repo_uri}" || die "${ESVN}: can't fetch to ${wc_path} from ${repo_uri}."
268 else
225 ${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}."
270 fi
226 271
227 elif [[ -n ${ESVN_OFFLINE} ]]; then 272 elif [[ -n ${ESVN_OFFLINE} ]]; then
273 svn upgrade "${wc_path}" &>/dev/null
274 svn cleanup "${wc_path}" &>/dev/null
228 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
229 if [[ -n ${ESVN_REVISION} && ${ESVN_REVISION} != ${ESVN_WC_REVISION} ]]; then 277 if [[ -n ${ESVN_REVISION} && ${ESVN_REVISION} != ${ESVN_WC_REVISION} ]]; then
230 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."
231 fi 279 fi
232 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}."
233 else 281 else
282 svn upgrade "${wc_path}" &>/dev/null
283 svn cleanup "${wc_path}" &>/dev/null
234 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."
235 285
236 local esvn_up_freq= 286 local esvn_up_freq=
237 if [[ -n ${ESVN_UP_FREQ} ]]; then 287 if [[ -n ${ESVN_UP_FREQ} ]]; then
238 if [[ -n ${ESVN_UP_FREQ//[[:digit:]]} ]]; then 288 if [[ -n ${ESVN_UP_FREQ//[[:digit:]]} ]]; then
… …
243 esvn_up_freq=no_update 293 esvn_up_freq=no_update
244 fi 294 fi
245 fi 295 fi
246 296
247 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
248 if [[ ${ESVN_WC_URL} != $(subversion__get_repository_uri "${repo_uri}") ]]; then 316 elif [[ ${ESVN_WC_URL} != $(subversion__get_repository_uri "${repo_uri}") ]]; then
249 einfo "subversion switch start -->" 317 einfo "subversion switch start -->"
250 einfo " old repository: ${ESVN_WC_URL}@${ESVN_WC_REVISION}" 318 einfo " old repository: ${ESVN_WC_URL}@${ESVN_WC_REVISION}"
251 einfo " new repository: ${repo_uri}${revision:+@}${revision}" 319 einfo " new repository: ${repo_uri}${revision:+@}${revision}"
252 320
253 debug-print "${FUNCNAME}: ${ESVN_SWITCH_CMD} ${options} ${repo_uri}" 321 debug-print "${FUNCNAME}: ${ESVN_SWITCH_CMD} ${options} ${repo_uri}"
254 322
255 cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}" 323 cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}"
324 if [[ -n "${ESVN_USER}" ]]; then
325 ${ESVN_SWITCH_CMD} ${options} --username "${ESVN_USER}" --password "${ESVN_PASSWORD}" ${repo_uri} || die "${ESVN}: can't update ${wc_path} from ${repo_uri}."
326 else
256 ${ESVN_SWITCH_CMD} ${options} ${repo_uri} || die "${ESVN}: can't update ${wc_path} from ${repo_uri}" 327 ${ESVN_SWITCH_CMD} ${options} ${repo_uri} || die "${ESVN}: can't update ${wc_path} from ${repo_uri}."
328 fi
257 else 329 else
258 # update working copy 330 # update working copy
259 einfo "subversion update start -->" 331 einfo "subversion update start -->"
260 einfo " repository: ${repo_uri}${revision:+@}${revision}" 332 einfo " repository: ${repo_uri}${revision:+@}${revision}"
261 333
262 debug-print "${FUNCNAME}: ${ESVN_UPDATE_CMD} ${options}" 334 debug-print "${FUNCNAME}: ${ESVN_UPDATE_CMD} ${options}"
263 335
264 cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}" 336 cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}"
337 if [[ -n "${ESVN_USER}" ]]; then
338 ${ESVN_UPDATE_CMD} ${options} --username "${ESVN_USER}" --password "${ESVN_PASSWORD}" || die "${ESVN}: can't update ${wc_path} from ${repo_uri}."
339 else
265 ${ESVN_UPDATE_CMD} ${options} || die "${ESVN}: can't update ${wc_path} from ${repo_uri}." 340 ${ESVN_UPDATE_CMD} ${options} || die "${ESVN}: can't update ${wc_path} from ${repo_uri}."
341 fi
266 fi 342 fi
267 fi 343 fi
344 fi
345
346 if [[ -n "${ESVN_UMASK}" ]]; then
347 eumask_pop
268 fi 348 fi
269 349
270 einfo " working copy: ${wc_path}" 350 einfo " working copy: ${wc_path}"
271 351
272 if ! has "export" ${ESVN_RESTRICT}; then 352 if ! has "export" ${ESVN_RESTRICT}; then
273 cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}" 353 cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}"
274 354
275 local S="${S}/${S_dest}" 355 local S="${S}/${S_dest}"
356 mkdir -p "${S}"
276 357
277 # export to the ${WORKDIR} 358 # export to the ${WORKDIR}
278 #* "svn export" has a bug. see http://bugs.gentoo.org/119236 359 #* "svn export" has a bug. see http://bugs.gentoo.org/119236
279 #* svn export . "${S}" || die "${ESVN}: can't export to ${S}." 360 #* svn export . "${S}" || die "${ESVN}: can't export to ${S}."
280 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}."
281 fi 362 fi
282 363
364 popd > /dev/null
283 echo 365 echo
284} 366}
285 367
286# @FUNCTION: subversion_bootstrap 368# @FUNCTION: subversion_bootstrap
287# @DESCRIPTION: 369# @DESCRIPTION:
… …
292 fi 374 fi
293 375
294 cd "${S}" 376 cd "${S}"
295 377
296 if [[ -n ${ESVN_PATCHES} ]]; then 378 if [[ -n ${ESVN_PATCHES} ]]; then
379 local patch fpatch
297 einfo "apply patches -->" 380 einfo "apply patches -->"
298
299 local patch fpatch
300
301 for patch in ${ESVN_PATCHES}; do 381 for patch in ${ESVN_PATCHES}; do
302 if [[ -f ${patch} ]]; then 382 if [[ -f ${patch} ]]; then
303 epatch "${patch}" 383 epatch "${patch}"
304
305 else 384 else
306 for fpatch in ${FILESDIR}/${patch}; do 385 for fpatch in ${FILESDIR}/${patch}; do
307 if [[ -f ${fpatch} ]]; then 386 if [[ -f ${fpatch} ]]; then
308 epatch "${fpatch}" 387 epatch "${fpatch}"
309
310 else 388 else
311 die "${ESVN}: ${patch} not found" 389 die "${ESVN}: ${patch} not found"
312
313 fi 390 fi
314 done 391 done
315
316 fi 392 fi
317 done 393 done
318
319 echo 394 echo
320 fi 395 fi
321 396
322 if [[ -n ${ESVN_BOOTSTRAP} ]]; then 397 if [[ -n ${ESVN_BOOTSTRAP} ]]; then
323 einfo "begin bootstrap -->" 398 einfo "begin bootstrap -->"
324
325 if [[ -f ${ESVN_BOOTSTRAP} && -x ${ESVN_BOOTSTRAP} ]]; then 399 if [[ -f ${ESVN_BOOTSTRAP} && -x ${ESVN_BOOTSTRAP} ]]; then
326 einfo " bootstrap with a file: ${ESVN_BOOTSTRAP}" 400 einfo " bootstrap with a file: ${ESVN_BOOTSTRAP}"
327 eval "./${ESVN_BOOTSTRAP}" || die "${ESVN}: can't execute ESVN_BOOTSTRAP." 401 eval "./${ESVN_BOOTSTRAP}" || die "${ESVN}: can't execute ESVN_BOOTSTRAP."
328
329 else 402 else
330 einfo " bootstrap with command: ${ESVN_BOOTSTRAP}" 403 einfo " bootstrap with command: ${ESVN_BOOTSTRAP}"
331 eval "${ESVN_BOOTSTRAP}" || die "${ESVN}: can't eval ESVN_BOOTSTRAP." 404 eval "${ESVN_BOOTSTRAP}" || die "${ESVN}: can't eval ESVN_BOOTSTRAP."
332
333 fi 405 fi
334 fi 406 fi
335} 407}
336 408
337# @FUNCTION: subversion_src_unpack 409# @FUNCTION: subversion_src_unpack
338# @DESCRIPTION: 410# @DESCRIPTION:
339# default src_unpack. fetch and bootstrap. 411# Default src_unpack. Fetch and, in older EAPIs, bootstrap.
340subversion_src_unpack() { 412subversion_src_unpack() {
341 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() {
342 subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap." 423 subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap."
343} 424}
344 425
345# @FUNCTION: subversion_wc_info 426# @FUNCTION: subversion_wc_info
346# @USAGE: [repo_uri] 427# @USAGE: [repo_uri]
… …
377# 458#
378subversion__svn_info() { 459subversion__svn_info() {
379 local target="${1}" 460 local target="${1}"
380 local key="${2}" 461 local key="${2}"
381 462
382 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-
383} 466}
384 467
385## -- subversion__get_repository_uri() --------------------------------------- # 468## -- subversion__get_repository_uri() --------------------------------------- #
386# 469#
387# param $1 - a repository URI. 470# param $1 - a repository URI.
388subversion__get_repository_uri() { 471subversion__get_repository_uri() {
389 local repo_uri="${1}" 472 local repo_uri="${1}"
390 473
391 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 474 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
392
393 if [[ -z ${repo_uri} ]]; then 475 if [[ -z ${repo_uri} ]]; then
394 die "${ESVN}: ESVN_REPO_URI (or specified URI) is empty." 476 die "${ESVN}: ESVN_REPO_URI (or specified URI) is empty."
395 fi 477 fi
396
397 # delete trailing slash 478 # delete trailing slash
398 if [[ -z ${repo_uri##*/} ]]; then 479 if [[ -z ${repo_uri##*/} ]]; then
399 repo_uri="${repo_uri%/}" 480 repo_uri="${repo_uri%/}"
400 fi 481 fi
401
402 repo_uri="${repo_uri%@*}" 482 repo_uri="${repo_uri%@*}"
403 483
404 echo "${repo_uri}" 484 echo "${repo_uri}"
405} 485}
406 486
… …
418## -- subversion__get_peg_revision() ----------------------------------------- # 498## -- subversion__get_peg_revision() ----------------------------------------- #
419# 499#
420# param $1 - a repository URI. 500# param $1 - a repository URI.
421subversion__get_peg_revision() { 501subversion__get_peg_revision() {
422 local repo_uri="${1}" 502 local repo_uri="${1}"
503 local peg_rev=
423 504
424 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 505 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
425
426 # repo_uri has peg revision ? 506 # repo_uri has peg revision?
427 if [[ ${repo_uri} != *@* ]]; then 507 if [[ ${repo_uri} = *@* ]]; then
508 peg_rev="${repo_uri##*@}"
509 debug-print "${FUNCNAME}: peg_rev = ${peg_rev}"
510 else
428 debug-print "${FUNCNAME}: repo_uri does not have a peg revision." 511 debug-print "${FUNCNAME}: repo_uri does not have a peg revision."
429 fi 512 fi
430
431 local peg_rev=
432 [[ ${repo_uri} = *@* ]] && peg_rev="${repo_uri##*@}"
433
434 debug-print "${FUNCNAME}: peg_rev = ${peg_rev}"
435 513
436 echo "${peg_rev}" 514 echo "${peg_rev}"
437} 515}
438 516
439# @FUNCTION: subversion_pkg_preinst 517# @FUNCTION: subversion_pkg_preinst
Legend:
Removed from v.1.59  
changed lines
  Added in v.1.77
  ViewVC Help
Powered by ViewVC 1.1.13