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

Diff of /eclass/subversion.eclass

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

Revision 1.46 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.46 2008/02/20 17:11:34 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 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"
39 48
40# @ECLASS-VARIABLE: ESVN_UPDATE_CMD 49# @ECLASS-VARIABLE: ESVN_UPDATE_CMD
41# @DESCRIPTION: 50# @DESCRIPTION:
42# subversion update command 51# subversion update command
43ESVN_UPDATE_CMD="svn update" 52ESVN_UPDATE_CMD="svn update"
53
54# @ECLASS-VARIABLE: ESVN_SWITCH_CMD
55# @DESCRIPTION:
56# subversion switch command
57ESVN_SWITCH_CMD="svn switch"
44 58
45# @ECLASS-VARIABLE: ESVN_OPTIONS 59# @ECLASS-VARIABLE: ESVN_OPTIONS
46# @DESCRIPTION: 60# @DESCRIPTION:
47# the options passed to checkout or update. If you want a specific revision see 61# the options passed to checkout or update. If you want a specific revision see
48# ESVN_REPO_URI instead of using -rREV. 62# ESVN_REPO_URI instead of using -rREV.
61# svn+ssh:// 75# svn+ssh://
62# 76#
63# to peg to a specific revision, append @REV to the repo's uri 77# to peg to a specific revision, append @REV to the repo's uri
64ESVN_REPO_URI="${ESVN_REPO_URI:-}" 78ESVN_REPO_URI="${ESVN_REPO_URI:-}"
65 79
80# @ECLASS-VARIABLE: ESVN_REVISION
81# @DESCRIPTION:
82# User configurable revision checkout or update to from the repository
83#
84# Useful for live svn or trunk svn ebuilds allowing the user to peg
85# to a specific revision
86#
87# Note: This should never be set in an ebuild!
88ESVN_REVISION="${ESVN_REVISION:-}"
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
66# @ECLASS-VARIABLE: ESVN_PROJECT 100# @ECLASS-VARIABLE: ESVN_PROJECT
67# @DESCRIPTION: 101# @DESCRIPTION:
68# project name of your ebuild (= name space) 102# project name of your ebuild (= name space)
69# 103#
70# subversion eclass will check out the subversion repository like: 104# subversion eclass will check out the subversion repository like:
107# restrict. 141# restrict.
108# export) 142# export)
109# don't export the working copy to S. 143# don't export the working copy to S.
110ESVN_RESTRICT="${ESVN_RESTRICT:-}" 144ESVN_RESTRICT="${ESVN_RESTRICT:-}"
111 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
152# @ECLASS-VARIABLE: ESVN_OFFLINE
153# @DESCRIPTION:
154# Set this variable to a non-empty value to disable the automatic updating of
155# an svn source tree. This is intended to be set outside the subversion source
156# tree by users.
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:=}"
175
176# @ECLASS-VARIABLE: ESCM_LOGDIR
177# @DESCRIPTION:
178# User configuration variable. If set to a path such as e.g. /var/log/scm any
179# package inheriting from subversion.eclass will record svn revision to
180# ${CATEGORY}/${PN}.log in that path in pkg_preinst. This is not supposed to be
181# set by ebuilds/eclasses. It defaults to empty so users need to opt in.
182ESCM_LOGDIR="${ESCM_LOGDIR:=}"
183
112# @FUNCTION: subversion_fetch 184# @FUNCTION: subversion_fetch
113# @USAGE: [repo_uri] [destination] 185# @USAGE: [repo_uri] [destination]
114# @DESCRIPTION: 186# @DESCRIPTION:
115# Wrapper function to fetch sources from subversion via svn checkout or svn update, 187# Wrapper function to fetch sources from subversion via svn checkout or svn update,
116# depending on whether there is an existing working copy in ${ESVN_STORE_DIR}. 188# depending on whether there is an existing working copy in ${ESVN_STORE_DIR}.
117# 189#
118# Can take two optional parameters: 190# Can take two optional parameters:
119# repo_uri - a repository URI. default is ESVN_REPO_URI. 191# repo_uri - a repository URI. default is ESVN_REPO_URI.
120# destination - a check out path in S. 192# destination - a check out path in S.
121subversion_fetch() { 193subversion_fetch() {
122 local repo_uri="$(subversion__get_repository_uri "${1}")" 194 local repo_uri="$(subversion__get_repository_uri "${1:-${ESVN_REPO_URI}}")"
195 local revision="$(subversion__get_peg_revision "${1:-${ESVN_REPO_URI}}")"
123 local S_dest="${2}" 196 local S_dest="${2}"
197
198 if [[ -z ${repo_uri} ]]; then
199 die "${ESVN}: ESVN_REPO_URI (or specified URI) is empty."
200 fi
201
202 [[ -n "${ESVN_REVISION}" ]] && revision="${ESVN_REVISION}"
124 203
125 # check for the protocol 204 # check for the protocol
126 local protocol="${repo_uri%%:*}" 205 local protocol="${repo_uri%%:*}"
127 206
128 case "${protocol}" in 207 case "${protocol}" in
129 http|https) 208 http|https)
130 if built_with_use dev-util/subversion nowebdav; then 209 if ! built_with_use -o dev-vcs/subversion webdav-neon webdav-serf; then
131 echo 210 echo
132 eerror "In order to emerge this package, you need to" 211 eerror "In order to emerge this package, you need to"
133 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."
134 echo 214 echo
135 die "${ESVN}: please run 'USE=-nowebdav emerge subversion'" 215 die "${ESVN}: reinstall Subversion with support for WebDAV."
136 fi 216 fi
137 ;; 217 ;;
138 svn|svn+ssh) 218 svn|svn+ssh)
139 ;; 219 ;;
140 *) 220 *)
143 esac 223 esac
144 224
145 addread "/etc/subversion" 225 addread "/etc/subversion"
146 addwrite "${ESVN_STORE_DIR}" 226 addwrite "${ESVN_STORE_DIR}"
147 227
228 if [[ -n "${ESVN_UMASK}" ]]; then
229 eumask_push "${ESVN_UMASK}"
230 fi
231
148 if [[ ! -d ${ESVN_STORE_DIR} ]]; then 232 if [[ ! -d ${ESVN_STORE_DIR} ]]; then
149 debug-print "${FUNCNAME}: initial checkout. creating subversion directory" 233 debug-print "${FUNCNAME}: initial checkout. creating subversion directory"
150 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}."
151 fi 235 fi
152 236
153 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}"
154 238
155 local wc_path="$(subversion__get_wc_path "${repo_uri}")" 239 local wc_path="$(subversion__get_wc_path "${repo_uri}")"
156 local options="${ESVN_OPTIONS} --config-dir ${ESVN_STORE_DIR}/.subversion" 240 local options="${ESVN_OPTIONS} --config-dir ${ESVN_STORE_DIR}/.subversion"
241
242 [[ -n "${revision}" ]] && options="${options} -r ${revision}"
243
244 if [[ "${ESVN_OPTIONS}" = *-r* ]]; then
245 ewarn "\${ESVN_OPTIONS} contains -r, this usage is unsupported. Please"
246 ewarn "see \${ESVN_REPO_URI}"
247 fi
248
249 if has_version ">=dev-vcs/subversion-1.6.0"; then
250 options="${options} --config-option=config:auth:password-stores="
251 fi
157 252
158 debug-print "${FUNCNAME}: wc_path = \"${wc_path}\"" 253 debug-print "${FUNCNAME}: wc_path = \"${wc_path}\""
159 debug-print "${FUNCNAME}: ESVN_OPTIONS = \"${ESVN_OPTIONS}\"" 254 debug-print "${FUNCNAME}: ESVN_OPTIONS = \"${ESVN_OPTIONS}\""
160 debug-print "${FUNCNAME}: options = \"${options}\"" 255 debug-print "${FUNCNAME}: options = \"${options}\""
161 256
162 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
163 # first check out 261 # first check out
164 einfo "subversion check out start -->" 262 einfo "subversion check out start -->"
165 einfo " repository: ${repo_uri}" 263 einfo " repository: ${repo_uri}${revision:+@}${revision}"
166 264
167 debug-print "${FUNCNAME}: ${ESVN_FETCH_CMD} ${options} ${repo_uri}" 265 debug-print "${FUNCNAME}: ${ESVN_FETCH_CMD} ${options} ${repo_uri}"
168 266
169 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}."
170 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
171 ${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
172 274
275 elif [[ -n ${ESVN_OFFLINE} ]]; then
276 svn upgrade "${wc_path}" &>/dev/null
277 svn cleanup "${wc_path}" &>/dev/null
278 subversion_wc_info "${repo_uri}" || die "${ESVN}: unknown problem occurred while accessing working copy."
279 if [[ -n ${ESVN_REVISION} && ${ESVN_REVISION} != ${ESVN_WC_REVISION} ]]; then
280 die "${ESVN}: You requested off-line updating and revision ${ESVN_REVISION} but only revision ${ESVN_WC_REVISION} is available locally."
281 fi
282 einfo "Fetching disabled: Using existing repository copy at revision ${ESVN_WC_REVISION}."
173 else 283 else
284 svn upgrade "${wc_path}" &>/dev/null
285 svn cleanup "${wc_path}" &>/dev/null
174 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."
175 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
176 if [[ ${ESVN_WC_URL} != $(subversion__get_repository_uri "${repo_uri}" 1) ]]; then 318 elif [[ ${ESVN_WC_URL} != $(subversion__get_repository_uri "${repo_uri}") ]]; then
177 die "${ESVN}: ESVN_REPO_URI (or specified URI) and working copy's URL are not matched."
178 fi
179
180 # update working copy
181 einfo "subversion update start -->" 319 einfo "subversion switch start -->"
182 einfo " repository: ${repo_uri}" 320 einfo " old repository: ${ESVN_WC_URL}@${ESVN_WC_REVISION}"
321 einfo " new repository: ${repo_uri}${revision:+@}${revision}"
183 322
184 debug-print "${FUNCNAME}: ${ESVN_UPDATE_CMD} ${options}" 323 debug-print "${FUNCNAME}: ${ESVN_SWITCH_CMD} ${options} ${repo_uri}"
185 324
186 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
329 ${ESVN_SWITCH_CMD} ${options} ${repo_uri} || die "${ESVN}: can't update ${wc_path} from ${repo_uri}."
330 fi
331 else
332 # update working copy
333 einfo "subversion update start -->"
334 einfo " repository: ${repo_uri}${revision:+@}${revision}"
335
336 debug-print "${FUNCNAME}: ${ESVN_UPDATE_CMD} ${options}"
337
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
187 ${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
344 fi
345 fi
346 fi
188 347
348 if [[ -n "${ESVN_UMASK}" ]]; then
349 eumask_pop
189 fi 350 fi
190 351
191 einfo " working copy: ${wc_path}" 352 einfo " working copy: ${wc_path}"
192 353
193 if ! has "export" ${ESVN_RESTRICT}; then 354 if ! has "export" ${ESVN_RESTRICT}; then
194 cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}" 355 cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}"
195 356
196 local S="${S}/${S_dest}" 357 local S="${S}/${S_dest}"
358 mkdir -p "${S}"
197 359
198 # export to the ${WORKDIR} 360 # export to the ${WORKDIR}
199 #* "svn export" has a bug. see http://bugs.gentoo.org/119236 361 #* "svn export" has a bug. see http://bugs.gentoo.org/119236
200 #* svn export . "${S}" || die "${ESVN}: can't export to ${S}." 362 #* svn export . "${S}" || die "${ESVN}: can't export to ${S}."
201 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}."
202 fi 364 fi
203 365
366 popd > /dev/null
367
204 echo 368 echo
205} 369}
206 370
207# @FUNCTION: subversion_bootstrap 371# @FUNCTION: subversion_bootstrap
208# @DESCRIPTION: 372# @DESCRIPTION:
255 fi 419 fi
256} 420}
257 421
258# @FUNCTION: subversion_src_unpack 422# @FUNCTION: subversion_src_unpack
259# @DESCRIPTION: 423# @DESCRIPTION:
260# default src_unpack. fetch and bootstrap. 424# Default src_unpack. Fetch and, in older EAPIs, bootstrap.
261subversion_src_unpack() { 425subversion_src_unpack() {
262 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() {
263 subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap." 436 subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap."
264} 437}
265 438
266# @FUNCTION: subversion_wc_info 439# @FUNCTION: subversion_wc_info
267# @USAGE: [repo_uri] 440# @USAGE: [repo_uri]
268# @RETURN: ESVN_WC_URL, ESVN_WC_REVISION and ESVN_WC_PATH 441# @RETURN: ESVN_WC_URL, ESVN_WC_ROOT, ESVN_WC_UUID, ESVN_WC_REVISION and ESVN_WC_PATH
269# @DESCRIPTION: 442# @DESCRIPTION:
270# 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.
271# 444#
272# 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
273# ESVN_WC_* variables. 446# ESVN_WC_* variables.
274subversion_wc_info() { 447subversion_wc_info() {
275 local repo_uri="$(subversion__get_repository_uri "${1}")" 448 local repo_uri="$(subversion__get_repository_uri "${1:-${ESVN_REPO_URI}}")"
276 local wc_path="$(subversion__get_wc_path "${repo_uri}")" 449 local wc_path="$(subversion__get_wc_path "${repo_uri}")"
277 450
278 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 451 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
279 debug-print "${FUNCNAME}: wc_path = ${wc_path}" 452 debug-print "${FUNCNAME}: wc_path = ${wc_path}"
280 453
281 if [[ ! -d ${wc_path} ]]; then 454 if [[ ! -d ${wc_path} ]]; then
282 return 1 455 return 1
283 fi 456 fi
284 457
285 local k 458 export ESVN_WC_URL="$(subversion__svn_info "${wc_path}" "URL")"
286 459 export ESVN_WC_ROOT="$(subversion__svn_info "${wc_path}" "Repository Root")"
287 for k in url revision; do 460 export ESVN_WC_UUID="$(subversion__svn_info "${wc_path}" "Repository UUID")"
288 export ESVN_WC_$(subversion__to_upper_case "${k}")="$(subversion__svn_info "${wc_path}" "${k}")" 461 export ESVN_WC_REVISION="$(subversion__svn_info "${wc_path}" "Revision")"
289 done
290
291 export ESVN_WC_PATH="${wc_path}" 462 export ESVN_WC_PATH="${wc_path}"
292} 463}
293 464
294## -- Private Functions 465## -- Private Functions
295 466
300# 471#
301subversion__svn_info() { 472subversion__svn_info() {
302 local target="${1}" 473 local target="${1}"
303 local key="${2}" 474 local key="${2}"
304 475
476 env LC_ALL=C svn info \
477 ${options} --username "${ESVN_USER}" --password "${ESVN_PASSWORD}" \
305 env LC_ALL=C svn info "${target}" | grep -i "^${key}" | cut -d" " -f2- 478 "${target}" | grep -i "^${key}" | cut -d" " -f2-
306} 479}
307 480
308## -- subversion__get_repository_uri() --------------------------------------- # 481## -- subversion__get_repository_uri() --------------------------------------- #
309# 482#
310# param $1 - a repository URI. 483# param $1 - a repository URI.
311# param $2 - a peg revision is deleted from a return value if this is
312# specified.
313subversion__get_repository_uri() { 484subversion__get_repository_uri() {
314 local repo_uri="${1:-${ESVN_REPO_URI}}" 485 local repo_uri="${1}"
315 local remove_peg_revision="${2}"
316 486
317 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 487 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
318 debug-print "${FUNCNAME}: remove_peg_revision = ${remove_peg_revision}"
319 488
320 if [[ -z ${repo_uri} ]]; then 489 if [[ -z ${repo_uri} ]]; then
321 die "${ESVN}: ESVN_REPO_URI (or specified URI) is empty." 490 die "${ESVN}: ESVN_REPO_URI (or specified URI) is empty."
322 fi 491 fi
323 492
324 # delete trailing slash 493 # delete trailing slash
325 if [[ -z ${repo_uri##*/} ]]; then 494 if [[ -z ${repo_uri##*/} ]]; then
326 repo_uri="${repo_uri%/}" 495 repo_uri="${repo_uri%/}"
327 fi 496 fi
328 497
329 if [[ -n ${remove_peg_revision} ]]; then
330 if subversion__has_peg_revision "${repo_uri}"; then
331 repo_uri="${repo_uri%@*}" 498 repo_uri="${repo_uri%@*}"
332
333 debug-print "${FUNCNAME}: repo_uri has a peg revision"
334 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
335 fi
336 fi
337 499
338 echo "${repo_uri}" 500 echo "${repo_uri}"
339} 501}
340 502
341## -- subversion__get_wc_path() ---------------------------------------------- # 503## -- subversion__get_wc_path() ---------------------------------------------- #
342# 504#
343# param $1 - a repository URI. 505# param $1 - a repository URI.
344subversion__get_wc_path() { 506subversion__get_wc_path() {
345 local repo_uri="$(subversion__get_repository_uri "${1}" 1)" 507 local repo_uri="$(subversion__get_repository_uri "${1}")"
346 508
347 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 509 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
348 510
349 echo "${ESVN_STORE_DIR}/${ESVN_PROJECT}/${repo_uri##*/}" 511 echo "${ESVN_STORE_DIR}/${ESVN_PROJECT}/${repo_uri##*/}"
350} 512}
351 513
352## -- subversion__has_peg_revision() ----------------------------------------- # 514## -- subversion__get_peg_revision() ----------------------------------------- #
353# 515#
354# param $1 - a repository URI. 516# param $1 - a repository URI.
355subversion__has_peg_revision() { 517subversion__get_peg_revision() {
356 local repo_uri="${1}" 518 local repo_uri="${1}"
357 519
358 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 520 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
359 521
360 # repo_uri has peg revision ? 522 # repo_uri has peg revision ?
361 if [[ ${repo_uri} != *@* ]]; then 523 if [[ ${repo_uri} != *@* ]]; then
362 debug-print "${FUNCNAME}: repo_uri does not have a peg revision." 524 debug-print "${FUNCNAME}: repo_uri does not have a peg revision."
363 return 1
364 fi 525 fi
365 526
366 local peg_rev="${repo_uri##*@}" 527 local peg_rev=
367 528 [[ ${repo_uri} = *@* ]] && peg_rev="${repo_uri##*@}"
368 case "$(subversion__to_upper_case "${peg_rev}")" in
369 [[:digit:]]*)
370 # NUMBER
371 ;;
372 HEAD|BASE|COMMITED|PREV)
373 ;;
374 {[^}]*})
375 # DATE
376 ;;
377 *)
378 debug-print "${FUNCNAME}: repo_uri does not have a peg revision."
379 return 1
380 ;;
381 esac
382 529
383 debug-print "${FUNCNAME}: peg_rev = ${peg_rev}" 530 debug-print "${FUNCNAME}: peg_rev = ${peg_rev}"
384 531
385 return 0 532 echo "${peg_rev}"
386} 533}
387 534
388## -- subversion__to_upper_case() ----------------------------------------- # 535# @FUNCTION: subversion_pkg_preinst
389# 536# @USAGE: [repo_uri]
390# param $@ - the strings to upper case. 537# @DESCRIPTION:
391subversion__to_upper_case() { 538# Log the svn revision of source code. Doing this in pkg_preinst because we
392 echo "${@}" | tr "[:lower:]" "[:upper:]" 539# want the logs to stick around if packages are uninstalled without messing with
540# config protection.
541subversion_pkg_preinst() {
542 local pkgdate=$(date "+%Y%m%d %H:%M:%S")
543 subversion_wc_info "${1:-${ESVN_REPO_URI}}"
544 if [[ -n ${ESCM_LOGDIR} ]]; then
545 local dir="${ROOT}/${ESCM_LOGDIR}/${CATEGORY}"
546 if [[ ! -d ${dir} ]]; then
547 mkdir -p "${dir}" || \
548 eerror "Failed to create '${dir}' for logging svn revision to '${PORTDIR_SCM}'"
549 fi
550 local logmessage="svn: ${pkgdate} - ${PF}:${SLOT} was merged at revision ${ESVN_WC_REVISION}"
551 if [[ -d ${dir} ]]; then
552 echo "${logmessage}" >> "${dir}/${PN}.log"
553 else
554 eerror "Could not log the message '${logmessage}' to '${dir}/${PN}.log'"
555 fi
556 fi
393} 557}

Legend:
Removed from v.1.46  
changed lines
  Added in v.1.75

  ViewVC Help
Powered by ViewVC 1.1.20