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

Diff of /eclass/python.eclass

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

Revision 1.60 Revision 1.77
1# Copyright 1999-2009 Gentoo Foundation 1# Copyright 1999-2009 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/python.eclass,v 1.60 2009/08/05 18:31:30 arfrever Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.77 2009/10/11 13:34:23 arfrever Exp $
4 4
5# @ECLASS: python.eclass 5# @ECLASS: python.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# python@gentoo.org 7# python@gentoo.org
8#
9# original author: Alastair Tse <liquidx@gentoo.org>
10# @BLURB: A Utility Eclass that should be inherited by anything that deals with Python or Python modules. 8# @BLURB: A utility eclass that should be inherited by anything that deals with Python or Python modules.
11# @DESCRIPTION: 9# @DESCRIPTION:
12# Some useful functions for dealing with python. 10# Some useful functions for dealing with Python.
13inherit alternatives multilib
14 11
12inherit multilib
15 13
16if [[ -n "${NEED_PYTHON}" ]] ; then 14if [[ -n "${NEED_PYTHON}" ]]; then
17 PYTHON_ATOM=">=dev-lang/python-${NEED_PYTHON}" 15 PYTHON_ATOM=">=dev-lang/python-${NEED_PYTHON}"
18 DEPEND="${PYTHON_ATOM}" 16 DEPEND="${PYTHON_ATOM}"
19 RDEPEND="${DEPEND}" 17 RDEPEND="${DEPEND}"
20else 18else
21 PYTHON_ATOM="dev-lang/python" 19 PYTHON_ATOM="dev-lang/python"
22fi 20fi
23 21
24if ! has "${EAPI:-0}" 0 1 2 || [[ -n "${SUPPORT_PYTHON_ABIS}" ]]; then
25 DEPEND="${DEPEND} >=app-admin/eselect-python-20090804" 22DEPEND+=" >=app-admin/eselect-python-20090804
26fi 23 >=app-shells/bash-3.2"
27 24
28__python_eclass_test() { 25__python_eclass_test() {
29 __python_version_extract 2.3 26 __python_version_extract 2.3
30 echo -n "2.3 -> PYVER: $PYVER PYVER_MAJOR: $PYVER_MAJOR" 27 echo -n "2.3 -> PYVER: $PYVER PYVER_MAJOR: $PYVER_MAJOR"
31 echo " PYVER_MINOR: $PYVER_MINOR PYVER_MICRO: $PYVER_MICRO" 28 echo " PYVER_MINOR: $PYVER_MINOR PYVER_MICRO: $PYVER_MICRO"
65 export PYVER_ALL="${tmpstr#Python }" 62 export PYVER_ALL="${tmpstr#Python }"
66 __python_version_extract $PYVER_ALL 63 __python_version_extract $PYVER_ALL
67} 64}
68 65
69# @FUNCTION: PYTHON 66# @FUNCTION: PYTHON
70# @USAGE: [-a|--absolute-path] <Python_ABI="${PYTHON_ABI}"> 67# @USAGE: [-a|--absolute-path] [--] <Python_ABI="${PYTHON_ABI}">
71# @DESCRIPTION: 68# @DESCRIPTION:
72# Get Python interpreter filename for specified Python ABI. If Python_ABI argument 69# Get Python interpreter filename for specified Python ABI. If Python_ABI argument
73# is ommitted, then PYTHON_ABI environment variable must be set and is used. 70# is ommitted, then PYTHON_ABI environment variable must be set and is used.
74PYTHON() { 71PYTHON() {
75 local absolute_path="0" slot= 72 local absolute_path="0" slot=
76 73
77 while (($#)); do 74 while (($#)); do
78 case "$1" in 75 case "$1" in
79 -a|--absolute-path) 76 -a|--absolute-path)
80 absolute_path="1" 77 absolute_path="1"
78 ;;
79 --)
80 break
81 ;; 81 ;;
82 -*) 82 -*)
83 die "${FUNCNAME}(): Unrecognized option $1" 83 die "${FUNCNAME}(): Unrecognized option $1"
84 ;; 84 ;;
85 *) 85 *)
106 else 106 else
107 echo -n "python${slot}" 107 echo -n "python${slot}"
108 fi 108 fi
109} 109}
110 110
111unset PYTHON_ABIS
112unset PYTHON_ABIS_SANITY_CHECKS
113
111# @FUNCTION: validate_PYTHON_ABIS 114# @FUNCTION: validate_PYTHON_ABIS
112# @DESCRIPTION: 115# @DESCRIPTION:
113# Make sure PYTHON_ABIS variable has valid value. 116# Ensure that PYTHON_ABIS variable has valid value.
114validate_PYTHON_ABIS() { 117validate_PYTHON_ABIS() {
118 # Ensure that some functions cannot be accidentally successfully used in EAPI <= 2 without setting SUPPORT_PYTHON_ABIS variable.
119 if has "${EAPI:-0}" 0 1 2 && [[ -z "${SUPPORT_PYTHON_ABIS}" ]]; then
120 die "${FUNCNAME}() cannot be used in this EAPI without setting SUPPORT_PYTHON_ABIS variable"
121 fi
122
115 # Ensure that /usr/bin/python and /usr/bin/python-config are valid. 123 # Ensure that /usr/bin/python and /usr/bin/python-config are valid.
116 if [[ "$(</usr/bin/python)" != *"Gentoo Python wrapper program"* ]]; then 124 if [[ "$(readlink /usr/bin/python)" != "python-wrapper" ]]; then
117 die "/usr/bin/python isn't valid program" 125 die "'/usr/bin/python' isn't valid symlink"
118 fi 126 fi
119 if [[ "$(</usr/bin/python-config)" != *"Gentoo python-config wrapper script"* ]]; then 127 if [[ "$(</usr/bin/python-config)" != *"Gentoo python-config wrapper script"* ]]; then
120 die "/usr/bin/python-config isn't valid script" 128 die "'/usr/bin/python-config' isn't valid script"
121 fi 129 fi
122 130
123 # USE_${ABI_TYPE^^} and RESTRICT_${ABI_TYPE^^}_ABIS variables hopefully will be included in EAPI >= 4. 131 # USE_${ABI_TYPE^^} and RESTRICT_${ABI_TYPE^^}_ABIS variables hopefully will be included in EAPI >= 4.
124 if [[ -z "${PYTHON_ABIS}" ]] && has "${EAPI:-0}" 0 1 2 3; then 132 if [[ "$(declare -p PYTHON_ABIS 2> /dev/null)" != "declare -x PYTHON_ABIS="* ]] && has "${EAPI:-0}" 0 1 2 3; then
125 local ABI support_ABI supported_PYTHON_ABIS= restricted_ABI 133 local ABI python2_supported_versions python3_supported_versions restricted_ABI support_ABI supported_PYTHON_ABIS=
126 PYTHON_ABI_SUPPORTED_VALUES="2.4 2.5 2.6 2.7 3.0 3.1 3.2" 134 PYTHON_ABI_SUPPORTED_VALUES="2.4 2.5 2.6 2.7 3.0 3.1 3.2"
135 python2_supported_versions="2.4 2.5 2.6 2.7"
136 python3_supported_versions="3.0 3.1 3.2"
137
138 if [[ "$(declare -p USE_PYTHON 2> /dev/null)" == "declare -x USE_PYTHON="* ]]; then
139 local python2_enabled="0" python3_enabled="0"
140
141 if [[ -z "${USE_PYTHON}" ]]; then
142 die "USE_PYTHON variable is empty"
143 fi
144
127 for ABI in ${USE_PYTHON}; do 145 for ABI in ${USE_PYTHON}; do
128 if ! has "${ABI}" ${PYTHON_ABI_SUPPORTED_VALUES}; then 146 if ! has "${ABI}" ${PYTHON_ABI_SUPPORTED_VALUES}; then
129 ewarn "Ignoring unsupported Python ABI '${ABI}'" 147 die "USE_PYTHON variable contains invalid value '${ABI}'"
130 continue
131 fi 148 fi
149
150 if has "${ABI}" ${python2_supported_versions}; then
151 python2_enabled="1"
152 fi
153 if has "${ABI}" ${python3_supported_versions}; then
154 python3_enabled="1"
155 fi
156
132 support_ABI="1" 157 support_ABI="1"
133 for restricted_ABI in ${RESTRICT_PYTHON_ABIS}; do 158 for restricted_ABI in ${RESTRICT_PYTHON_ABIS}; do
134 if python -c "from fnmatch import fnmatch; exit(not fnmatch('${ABI}', '${restricted_ABI}'))"; then 159 if [[ "${ABI}" == ${restricted_ABI} ]]; then
135 support_ABI="0" 160 support_ABI="0"
136 break 161 break
137 fi 162 fi
163 done
164 [[ "${support_ABI}" == "1" ]] && supported_PYTHON_ABIS+=" ${ABI}"
138 done 165 done
139 [[ "${support_ABI}" == "1" ]] && supported_PYTHON_ABIS+=" ${ABI}" 166 export PYTHON_ABIS="${supported_PYTHON_ABIS# }"
167
168 if [[ -z "${PYTHON_ABIS//[${IFS}]/}" ]]; then
169 die "USE_PYTHON variable doesn't enable any version of Python supported by ${CATEGORY}/${PF}"
170 fi
171
172 if [[ "${python2_enabled}" == "0" ]]; then
173 ewarn "USE_PYTHON variable doesn't enable any version of Python 2. This configuration is unsupported."
174 fi
175 if [[ "${python3_enabled}" == "0" ]]; then
176 ewarn "USE_PYTHON variable doesn't enable any version of Python 3. This configuration is unsupported."
177 fi
178 else
179 local python_version python2_version= python3_version= support_python_major_version
180
181 python_version="$(/usr/bin/python -c 'from sys import version_info; print(".".join([str(x) for x in version_info[:2]]))')"
182
183 if has_version "=dev-lang/python-2*"; then
184 if [[ "$(readlink /usr/bin/python2)" != "python2."* ]]; then
185 die "'/usr/bin/python2' isn't valid symlink"
186 fi
187
188 python2_version="$(/usr/bin/python2 -c 'from sys import version_info; print(".".join([str(x) for x in version_info[:2]]))')"
189
190 for ABI in ${python2_supported_versions}; do
191 support_python_major_version="1"
192 for restricted_ABI in ${RESTRICT_PYTHON_ABIS}; do
193 if [[ "${ABI}" == ${restricted_ABI} ]]; then
194 support_python_major_version="0"
195 fi
196 done
197 [[ "${support_python_major_version}" == "1" ]] && break
198 done
199 if [[ "${support_python_major_version}" == "1" ]]; then
200 for restricted_ABI in ${RESTRICT_PYTHON_ABIS}; do
201 if [[ "${python2_version}" == ${restricted_ABI} ]]; then
202 die "Active version of Python 2 isn't supported by ${CATEGORY}/${PF}"
203 fi
204 done
205 else
206 python2_version=""
207 fi
208 fi
209
210 if has_version "=dev-lang/python-3*"; then
211 if [[ "$(readlink /usr/bin/python3)" != "python3."* ]]; then
212 die "'/usr/bin/python3' isn't valid symlink"
213 fi
214
215 python3_version="$(/usr/bin/python3 -c 'from sys import version_info; print(".".join([str(x) for x in version_info[:2]]))')"
216
217 for ABI in ${python3_supported_versions}; do
218 support_python_major_version="1"
219 for restricted_ABI in ${RESTRICT_PYTHON_ABIS}; do
220 if [[ "${ABI}" == ${restricted_ABI} ]]; then
221 support_python_major_version="0"
222 fi
223 done
224 [[ "${support_python_major_version}" == "1" ]] && break
225 done
226 if [[ "${support_python_major_version}" == "1" ]]; then
227 for restricted_ABI in ${RESTRICT_PYTHON_ABIS}; do
228 if [[ "${python3_version}" == ${restricted_ABI} ]]; then
229 die "Active version of Python 3 isn't supported by ${CATEGORY}/${PF}"
230 fi
231 done
232 else
233 python3_version=""
234 fi
235 fi
236
237 if ! has "${python_version}" "${python2_version}" "${python3_version}"; then
238 eerror "Python wrapper is configured incorrectly or /usr/bin/python2 or /usr/bin/python3 symlink"
239 eerror "is set incorrectly. Use \`eselect python\` to fix configuration."
240 die "Incorrect configuration of Python"
241 fi
242
243 PYTHON_ABIS="${python2_version} ${python3_version}"
244 PYTHON_ABIS="${PYTHON_ABIS# }"
245 export PYTHON_ABIS="${PYTHON_ABIS% }"
246 fi
247 fi
248
249 if [[ "$(declare -p PYTHON_ABIS_SANITY_CHECKS 2> /dev/null)" != "declare -- PYTHON_ABIS_SANITY_CHECKS="* ]]; then
250 local PYTHON_ABI
251 for PYTHON_ABI in ${PYTHON_ABIS}; do
252 # Ensure that appropriate Python version is installed.
253 if ! has_version "dev-lang/python:${PYTHON_ABI}"; then
254 die "dev-lang/python:${PYTHON_ABI} isn't installed"
255 fi
256
257 # Ensure that EPYTHON variable is respected.
258 if [[ "$(EPYTHON="$(PYTHON)" python -c 'from sys import version_info; print(".".join([str(x) for x in version_info[:2]]))')" != "${PYTHON_ABI}" ]]; then
259 die "'python' doesn't respect EPYTHON variable"
260 fi
140 done 261 done
141 export PYTHON_ABIS="${supported_PYTHON_ABIS# }" 262 PYTHON_ABIS_SANITY_CHECKS="1"
142 fi
143
144 if [[ -z "${PYTHON_ABIS//[${IFS}]/}" ]]; then
145 python_version
146 export PYTHON_ABIS="${PYVER}"
147 fi 263 fi
148} 264}
149 265
150# @FUNCTION: python_copy_sources 266# @FUNCTION: python_copy_sources
151# @USAGE: [directory] 267# @USAGE: [--no-link] [--] [directory]
152# @DESCRIPTION: 268# @DESCRIPTION:
153# Copy unpacked sources of given package for each Python ABI. 269# Copy unpacked sources of given package for each Python ABI.
154python_copy_sources() { 270python_copy_sources() {
155 local dir dirs=() PYTHON_ABI 271 local dir dirs=() no_link="0" PYTHON_ABI
272
273 while (($#)); do
274 case "$1" in
275 --no-link)
276 no_link="1"
277 ;;
278 --)
279 break
280 ;;
281 -*)
282 die "${FUNCNAME}(): Unrecognized option '$1'"
283 ;;
284 *)
285 break
286 ;;
287 esac
288 shift
289 done
156 290
157 if [[ "$#" -eq "0" ]]; then 291 if [[ "$#" -eq "0" ]]; then
158 if [[ "${WORKDIR}" == "${S}" ]]; then 292 if [[ "${WORKDIR}" == "${S}" ]]; then
159 die "${FUNCNAME}() cannot be used" 293 die "${FUNCNAME}() cannot be used"
160 fi 294 fi
164 fi 298 fi
165 299
166 validate_PYTHON_ABIS 300 validate_PYTHON_ABIS
167 for PYTHON_ABI in ${PYTHON_ABIS}; do 301 for PYTHON_ABI in ${PYTHON_ABIS}; do
168 for dir in "${dirs[@]}"; do 302 for dir in "${dirs[@]}"; do
303 if [[ "${no_link}" == "1" ]]; then
304 cp -pr "${dir}" "${dir}-${PYTHON_ABI}" > /dev/null || die "Copying of sources failed"
305 else
169 cp -lpr "${dir}" "${dir}-${PYTHON_ABI}" > /dev/null || die "Copying of sources failed" 306 cp -lpr "${dir}" "${dir}-${PYTHON_ABI}" > /dev/null || die "Copying of sources failed"
307 fi
170 done 308 done
171 done 309 done
172} 310}
173 311
174# @FUNCTION: python_set_build_dir_symlink 312# @FUNCTION: python_set_build_dir_symlink
176# @DESCRIPTION: 314# @DESCRIPTION:
177# Create build directory symlink. 315# Create build directory symlink.
178python_set_build_dir_symlink() { 316python_set_build_dir_symlink() {
179 local dir="$1" 317 local dir="$1"
180 318
181 [[ -z "${PYTHON_ABIS}" ]] && die "PYTHON_ABIS variable not set" 319 [[ -z "${PYTHON_ABI}" ]] && die "PYTHON_ABI variable not set"
182 [[ -z "${dir}" ]] && dir="build" 320 [[ -z "${dir}" ]] && dir="build"
183 321
184 # Don't delete preexistent directories. 322 # Don't delete preexistent directories.
185 rm -f "${dir}" || die "Deletion of '${dir}' failed" 323 rm -f "${dir}" || die "Deletion of '${dir}' failed"
186 ln -s "${dir}-${PYTHON_ABI}" "${dir}" || die "Creation of '${dir}' directory symlink failed" 324 ln -s "${dir}-${PYTHON_ABI}" "${dir}" || die "Creation of '${dir}' directory symlink failed"
187} 325}
188 326
189# @FUNCTION: python_execute_function 327# @FUNCTION: python_execute_function
190# @USAGE: [--action-message message] [-d|--default-function] [--failure-message message] [--nonfatal] [-q|--quiet] [-s|--separate-build-dirs] <function> [arguments] 328# @USAGE: [--action-message message] [-d|--default-function] [--failure-message message] [--nonfatal] [-q|--quiet] [-s|--separate-build-dirs] [--] <function> [arguments]
191# @DESCRIPTION: 329# @DESCRIPTION:
192# Execute specified function for each value of PYTHON_ABIS, optionally passing additional 330# Execute specified function for each value of PYTHON_ABIS, optionally passing additional
193# arguments. The specified function can use PYTHON_ABI and BUILDDIR variables. 331# arguments. The specified function can use PYTHON_ABI and BUILDDIR variables.
194python_execute_function() { 332python_execute_function() {
195 local action action_message action_message_template= default_function="0" failure_message failure_message_template= function nonfatal="0" PYTHON_ABI quiet="0" separate_build_dirs="0" 333 local action action_message action_message_template= default_function="0" failure_message failure_message_template= function nonfatal="0" previous_directory previous_directory_stack previous_directory_stack_length PYTHON_ABI quiet="0" separate_build_dirs="0"
196 334
197 while (($#)); do 335 while (($#)); do
198 case "$1" in 336 case "$1" in
199 --action-message) 337 --action-message)
200 action_message_template="$2" 338 action_message_template="$2"
214 quiet="1" 352 quiet="1"
215 ;; 353 ;;
216 -s|--separate-build-dirs) 354 -s|--separate-build-dirs)
217 separate_build_dirs="1" 355 separate_build_dirs="1"
218 ;; 356 ;;
357 --)
358 break
359 ;;
219 -*) 360 -*)
220 die "${FUNCNAME}(): Unrecognized option $1" 361 die "${FUNCNAME}(): Unrecognized option '$1'"
221 ;; 362 ;;
222 *) 363 *)
223 break 364 break
224 ;; 365 ;;
225 esac 366 esac
230 if [[ "$#" -eq "0" ]]; then 371 if [[ "$#" -eq "0" ]]; then
231 die "${FUNCNAME}(): Missing function name" 372 die "${FUNCNAME}(): Missing function name"
232 fi 373 fi
233 function="$1" 374 function="$1"
234 shift 375 shift
376
377 if [[ -z "$(type -t "${function}")" ]]; then
378 die "${FUNCNAME}(): '${function}' function isn't defined"
379 fi
235 else 380 else
236 if [[ "$#" -ne "0" ]]; then 381 if [[ "$#" -ne "0" ]]; then
237 die "${FUNCNAME}(): --default-function option and function name cannot be specified simultaneously" 382 die "${FUNCNAME}(): '--default-function' option and function name cannot be specified simultaneously"
238 fi 383 fi
239 if has "${EAPI:-0}" 0 1; then 384 if has "${EAPI:-0}" 0 1; then
240 die "${FUNCNAME}(): --default-function option cannot be used in this EAPI" 385 die "${FUNCNAME}(): '--default-function' option cannot be used in this EAPI"
241 fi 386 fi
242 387
243 if [[ "${EBUILD_PHASE}" == "configure" ]]; then 388 if [[ "${EBUILD_PHASE}" == "configure" ]]; then
389 if has "${EAPI}" 2; then
244 python_default_function() { 390 python_default_function() {
245 econf 391 econf
246 } 392 }
393 else
394 python_default_function() {
395 nonfatal econf
396 }
397 fi
247 elif [[ "${EBUILD_PHASE}" == "compile" ]]; then 398 elif [[ "${EBUILD_PHASE}" == "compile" ]]; then
248 python_default_function() { 399 python_default_function() {
249 emake 400 emake
250 } 401 }
251 elif [[ "${EBUILD_PHASE}" == "test" ]]; then 402 elif [[ "${EBUILD_PHASE}" == "test" ]]; then
301 else 452 else
302 action_message="${action} of ${CATEGORY}/${PF} with Python ${PYTHON_ABI}..." 453 action_message="${action} of ${CATEGORY}/${PF} with Python ${PYTHON_ABI}..."
303 fi 454 fi
304 echo " ${GREEN}*${NORMAL} ${BLUE}${action_message}${NORMAL}" 455 echo " ${GREEN}*${NORMAL} ${BLUE}${action_message}${NORMAL}"
305 fi 456 fi
457
306 if [[ "${separate_build_dirs}" == "1" ]]; then 458 if [[ "${separate_build_dirs}" == "1" ]]; then
307 export BUILDDIR="${S}-${PYTHON_ABI}" 459 export BUILDDIR="${S}-${PYTHON_ABI}"
308 pushd "${BUILDDIR}" > /dev/null || die "pushd failed" 460 pushd "${BUILDDIR}" > /dev/null || die "pushd failed"
309 else 461 else
310 export BUILDDIR="${S}" 462 export BUILDDIR="${S}"
311 fi 463 fi
464
465 previous_directory="$(pwd)"
466 previous_directory_stack="$(dirs -p)"
467 previous_directory_stack_length="$(dirs -p | wc -l)"
468
469 if ! has "${EAPI}" 0 1 2 && has "${PYTHON_ABI}" ${FAILURE_TOLERANT_PYTHON_ABIS}; then
470 EPYTHON="$(PYTHON)" nonfatal "${function}" "$@"
471 else
312 if ! EPYTHON="$(PYTHON)" "${function}" "$@"; then 472 EPYTHON="$(PYTHON)" "${function}" "$@"
473 fi
474
475 if [[ "$?" != "0" ]]; then
313 if [[ -n "${failure_message_template}" ]]; then 476 if [[ -n "${failure_message_template}" ]]; then
314 failure_message="$(eval echo -n "${failure_message_template}")" 477 failure_message="$(eval echo -n "${failure_message_template}")"
315 else 478 else
316 failure_message="${action} failed with Python ${PYTHON_ABI} in ${function}() function" 479 failure_message="${action} failed with Python ${PYTHON_ABI} in ${function}() function"
317 fi 480 fi
318 if [[ "${nonfatal}" == "1" ]] || has "${PYTHON_ABI}" ${FAILURE_TOLERANT_PYTHON_ABIS}; then 481
319 local ABI enabled_PYTHON_ABIS 482 if [[ "${nonfatal}" == "1" ]]; then
320 for ABI in ${PYTHON_ABIS}; do
321 [[ "${ABI}" != "${PYTHON_ABI}" ]] && enabled_PYTHON_ABIS+=" ${ABI}"
322 done
323 export PYTHON_ABIS="${enabled_PYTHON_ABIS# }"
324 if [[ "${quiet}" == "0" ]]; then 483 if [[ "${quiet}" == "0" ]]; then
325 ewarn "${RED}${failure_message}${NORMAL}" 484 ewarn "${RED}${failure_message}${NORMAL}"
326 fi 485 fi
486 elif has "${PYTHON_ABI}" ${FAILURE_TOLERANT_PYTHON_ABIS}; then
487 if [[ "${EBUILD_PHASE}" != "test" ]] || ! has test-fail-continue ${FEATURES}; then
488 local ABI enabled_PYTHON_ABIS=
489 for ABI in ${PYTHON_ABIS}; do
490 [[ "${ABI}" != "${PYTHON_ABI}" ]] && enabled_PYTHON_ABIS+=" ${ABI}"
491 done
492 export PYTHON_ABIS="${enabled_PYTHON_ABIS# }"
493 fi
494 if [[ "${quiet}" == "0" ]]; then
495 ewarn "${RED}${failure_message}${NORMAL}"
496 fi
497 if [[ -z "${PYTHON_ABIS}" ]]; then
498 die "${function}() function failed with all enabled versions of Python"
499 fi
327 else 500 else
328 die "${failure_message}" 501 die "${failure_message}"
329 fi 502 fi
330 fi 503 fi
504
505 # Ensure that directory stack hasn't been decreased.
506 if [[ "$(dirs -p | wc -l)" -lt "${previous_directory_stack_length}" ]]; then
507 die "Directory stack decreased illegally"
508 fi
509
510 # Avoid side effects of earlier returning from the specified function.
511 while [[ "$(dirs -p | wc -l)" -gt "${previous_directory_stack_length}" ]]; do
512 popd > /dev/null || die "popd failed"
513 done
514
515 # Ensure that the bottom part of directory stack hasn't been changed. Restore
516 # previous directory (from before running of the specified function) before
517 # comparison of directory stacks to avoid mismatch of directory stacks after
518 # potential using of 'cd' to change current directory. Restoration of previous
519 # directory allows to safely use 'cd' to change current directory in the
520 # specified function without changing it back to original directory.
521 cd "${previous_directory}"
522 if [[ "$(dirs -p)" != "${previous_directory_stack}" ]]; then
523 die "Directory stack changed illegally"
524 fi
525
331 if [[ "${separate_build_dirs}" == "1" ]]; then 526 if [[ "${separate_build_dirs}" == "1" ]]; then
332 popd > /dev/null || die "popd failed" 527 popd > /dev/null || die "popd failed"
333 fi 528 fi
334 unset BUILDDIR 529 unset BUILDDIR
335 done 530 done
337 if [[ "${default_function}" == "1" ]]; then 532 if [[ "${default_function}" == "1" ]]; then
338 unset -f python_default_function 533 unset -f python_default_function
339 fi 534 fi
340} 535}
341 536
537# @FUNCTION: python_convert_shebangs
538# @USAGE: [-q|--quiet] [-r|--recursive] [-x|--only-executables] [--] <Python_version> <file|directory> [files|directories]
539# @DESCRIPTION:
540# Convert shebangs in specified files. Directories can be specified only with --recursive option.
541python_convert_shebangs() {
542 local argument file files=() only_executables="0" python_version quiet="0" recursive="0"
543
544 while (($#)); do
545 case "$1" in
546 -r|--recursive)
547 recursive="1"
548 ;;
549 -q|--quiet)
550 quiet="1"
551 ;;
552 -x|--only-executables)
553 only_executables="1"
554 ;;
555 --)
556 break
557 ;;
558 -*)
559 die "${FUNCNAME}(): Unrecognized option '$1'"
560 ;;
561 *)
562 break
563 ;;
564 esac
565 shift
566 done
567
568 if [[ "$#" -eq 0 ]]; then
569 die "${FUNCNAME}(): Missing Python version and files or directories"
570 elif [[ "$#" -eq 1 ]]; then
571 die "${FUNCNAME}(): Missing files or directories"
572 fi
573
574 python_version="$1"
575 shift
576
577 for argument in "$@"; do
578 if [[ ! -e "${argument}" ]]; then
579 die "${FUNCNAME}(): '${argument}' doesn't exist"
580 elif [[ -f "${argument}" ]]; then
581 files+=("${argument}")
582 elif [[ -d "${argument}" ]]; then
583 if [[ "${recursive}" == "1" ]]; then
584 if [[ "${only_executables}" == "1" ]]; then
585 files+=($(find "${argument}" -perm /111 -type f))
586 else
587 files+=($(find "${argument}" -type f))
588 fi
589 else
590 die "${FUNCNAME}(): '${argument}' isn't a regular file"
591 fi
592 else
593 die "${FUNCNAME}(): '${argument}' isn't a regular file or a directory"
594 fi
595 done
596
597 for file in "${files[@]}"; do
598 [[ "${only_executables}" == "1" && ! -x "${file}" ]] && continue
599
600 if [[ "$(head -n1 "${file}")" =~ ^'#!'.*python ]]; then
601 [[ "${quiet}" == "0" ]] && einfo "Converting shebang in '${file}'"
602 sed -e "1s/python\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?/python${python_version}/" -i "${file}" || die "Conversion of shebang in '${file}' failed"
603
604 # Delete potential whitespace after "#!".
605 sed -e '1s/\(^#!\)[[:space:]]*/\1/' -i "${file}" || die "sed '${file}' failed"
606 fi
607 done
608}
342 609
343# @ECLASS-VARIABLE: PYTHON_USE_WITH 610# @ECLASS-VARIABLE: PYTHON_USE_WITH
344# @DESCRIPTION: 611# @DESCRIPTION:
345# Set this to a space separated list of use flags 612# Set this to a space separated list of use flags
346# the python slot in use must be built with. 613# the python slot in use must be built with.
358 625
359# @FUNCTION: python_pkg_setup 626# @FUNCTION: python_pkg_setup
360# @DESCRIPTION: 627# @DESCRIPTION:
361# Makes sure PYTHON_USE_WITH or PYTHON_USE_WITH_OR listed use flags 628# Makes sure PYTHON_USE_WITH or PYTHON_USE_WITH_OR listed use flags
362# are respected. Only exported if one of those variables is set. 629# are respected. Only exported if one of those variables is set.
363if ! has ${EAPI} 0 1 && [[ -n ${PYTHON_USE_WITH} || -n ${PYTHON_USE_WITH_OR} ]]; then 630if ! has "${EAPI:-0}" 0 1 && [[ -n ${PYTHON_USE_WITH} || -n ${PYTHON_USE_WITH_OR} ]]; then
631 python_pkg_setup() {
364 python_pkg_setup_fail() { 632 python_pkg_setup_fail() {
365 eerror "${1}" 633 eerror "${1}"
366 die "${1}" 634 die "${1}"
635 }
636
637 [[ ${PYTHON_USE_WITH_OPT} ]] && use !${PYTHON_USE_WITH_OPT} && return
638
639 python_pkg_setup_check_USE_flags() {
640 local pyatom use
641 if [[ -n "${PYTHON_ABI}" ]]; then
642 pyatom="dev-lang/python:${PYTHON_ABI}"
643 else
644 python_version
645 pyatom="dev-lang/python:${PYVER}"
646 fi
647
648 for use in ${PYTHON_USE_WITH}; do
649 if ! has_version "${pyatom}[${use}]"; then
650 python_pkg_setup_fail "Please rebuild ${pyatom} with the following USE flags enabled: ${PYTHON_USE_WITH}"
651 fi
652 done
653
654 for use in ${PYTHON_USE_WITH_OR}; do
655 if has_version "${pyatom}[${use}]"; then
656 return
657 fi
658 done
659
660 if [[ ${PYTHON_USE_WITH_OR} ]]; then
661 python_pkg_setup_fail "Please rebuild ${pyatom} with at least one of the following USE flags enabled: ${PYTHON_USE_WITH_OR}"
662 fi
663 }
664
665 if ! has "${EAPI:-0}" 0 1 2 || [[ -n "${SUPPORT_PYTHON_ABIS}" ]]; then
666 python_execute_function -q python_pkg_setup_check_USE_flags
667 else
668 python_pkg_setup_check_USE_flags
669 fi
367 } 670 }
368 671
369 python_pkg_setup() {
370 [[ ${PYTHON_USE_WITH_OPT} ]] && use !${PYTHON_USE_WITH_OPT} && return
371
372 python_version
373 local failed
374 local pyatom="dev-lang/python:${PYVER}"
375
376 for use in ${PYTHON_USE_WITH}; do
377 if ! has_version "${pyatom}[${use}]"; then
378 python_pkg_setup_fail \
379 "Please rebuild ${pyatom} with use flags: ${PYTHON_USE_WITH}"
380 fi
381 done
382
383 for use in ${PYTHON_USE_WITH_OR}; do
384 if has_version "${pyatom}[${use}]"; then
385 return
386 fi
387 done
388
389 if [[ ${PYTHON_USE_WITH_OR} ]]; then
390 python_pkg_setup_fail \
391 "Please rebuild ${pyatom} with one of: ${PYTHON_USE_WITH_OR}"
392 fi
393 }
394
395 EXPORT_FUNCTIONS pkg_setup 672 EXPORT_FUNCTIONS pkg_setup
396 673
397 if [[ ${PYTHON_USE_WITH} ]]; then 674 if [[ -n "${PYTHON_USE_WITH}" ]]; then
398 PYTHON_USE_WITH_ATOM="${PYTHON_ATOM}[${PYTHON_USE_WITH/ /,}]" 675 PYTHON_USE_WITH_ATOM="${PYTHON_ATOM}[${PYTHON_USE_WITH/ /,}]"
399 elif [[ ${PYTHON_USE_WITH_OR} ]]; then 676 elif [[ -n "${PYTHON_USE_WITH_OR}" ]]; then
400 PYTHON_USE_WITH_ATOM="|| ( " 677 PYTHON_USE_WITH_ATOM="|| ( "
401 for use in ${PYTHON_USE_WITH_OR}; do 678 for use in ${PYTHON_USE_WITH_OR}; do
402 PYTHON_USE_WITH_ATOM=" 679 PYTHON_USE_WITH_ATOM+=" ${PYTHON_ATOM}[${use}]"
403 ${PYTHON_USE_WITH_ATOM}
404 ${PYTHON_ATOM}[${use}]"
405 done 680 done
406 PYTHON_USE_WITH_ATOM="${PYTHON_USE_WITH_ATOM} )" 681 unset use
682 PYTHON_USE_WITH_ATOM+=" )"
407 fi 683 fi
408 if [[ ${PYTHON_USE_WITH_OPT} ]]; then 684 if [[ -n "${PYTHON_USE_WITH_OPT}" ]]; then
409 PYTHON_USE_WITH_ATOM="${PYTHON_USE_WITH_OPT}? ( ${PYTHON_USE_WITH_ATOM} )" 685 PYTHON_USE_WITH_ATOM="${PYTHON_USE_WITH_OPT}? ( ${PYTHON_USE_WITH_ATOM} )"
410 fi 686 fi
411 DEPEND="${PYTHON_USE_WITH_ATOM}" 687 DEPEND+=" ${PYTHON_USE_WITH_ATOM}"
412 RDEPEND="${PYTHON_USE_WITH_ATOM}" 688 RDEPEND+=" ${PYTHON_USE_WITH_ATOM}"
413fi 689fi
414 690
691# @ECLASS-VARIABLE: PYTHON_DEFINE_DEFAULT_FUNCTIONS
692# @DESCRIPTION:
693# Set this to define default functions for the following ebuild phases:
694# src_prepare, src_configure, src_compile, src_test, src_install.
695if ! has "${EAPI:-0}" 0 1 && [[ -n "${PYTHON_DEFINE_DEFAULT_FUNCTIONS}" ]]; then
696 python_src_prepare() {
697 python_copy_sources
698 }
699
700 for python_default_function in src_configure src_compile src_test src_install; do
701 eval "python_${python_default_function}() { python_execute_function -d -s; }"
702 done
703 unset python_default_function
704
705 EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
706fi
707
415# @FUNCTION: python_disable_pyc 708# @FUNCTION: python_disable_pyc
416# @DESCRIPTION: 709# @DESCRIPTION:
417# Tells python not to automatically recompile modules to .pyc/.pyo 710# Tell Python not to automatically recompile modules to .pyc/.pyo
418# even if the timestamps/version stamps don't match. This is done 711# even if the timestamps/version stamps don't match. This is done
419# to protect sandbox. 712# to protect sandbox.
420#
421# note: supported by >=dev-lang/python-2.2.3-r3 only.
422#
423python_disable_pyc() { 713python_disable_pyc() {
424 export PYTHONDONTWRITEBYTECODE=1 # For 2.6 and above 714 export PYTHONDONTWRITEBYTECODE="1"
425 export PYTHON_DONTCOMPILE=1 # For 2.5 and below
426} 715}
427 716
428# @FUNCTION: python_enable_pyc 717# @FUNCTION: python_enable_pyc
429# @DESCRIPTION: 718# @DESCRIPTION:
430# Tells python to automatically recompile modules to .pyc/.pyo if the 719# Tell Python to automatically recompile modules to .pyc/.pyo if the
431# timestamps/version stamps change 720# timestamps/version stamps have changed.
432python_enable_pyc() { 721python_enable_pyc() {
433 unset PYTHONDONTWRITEBYTECODE 722 unset PYTHONDONTWRITEBYTECODE
434 unset PYTHON_DONTCOMPILE
435} 723}
436 724
437python_disable_pyc 725python_disable_pyc
438 726
439# @FUNCTION: python_need_rebuild 727# @FUNCTION: python_need_rebuild
471# @FUNCTION: python_get_sitedir 759# @FUNCTION: python_get_sitedir
472# @DESCRIPTION: 760# @DESCRIPTION:
473# Run without arguments, returns the Python site-packages directory. 761# Run without arguments, returns the Python site-packages directory.
474python_get_sitedir() { 762python_get_sitedir() {
475 echo "$(python_get_libdir)/site-packages" 763 echo "$(python_get_libdir)/site-packages"
476}
477
478# @FUNCTION: python_makesym
479# @DESCRIPTION:
480# Run without arguments, it will create the /usr/bin/python symlinks
481# to the latest installed version
482python_makesym() {
483 alternatives_auto_makesym "/usr/bin/python" "python[0-9].[0-9]"
484 alternatives_auto_makesym "/usr/bin/python2" "python2.[0-9]"
485} 764}
486 765
487# @FUNCTION: python_tkinter_exists 766# @FUNCTION: python_tkinter_exists
488# @DESCRIPTION: 767# @DESCRIPTION:
489# Run without arguments, checks if python was compiled with Tkinter 768# Run without arguments, checks if python was compiled with Tkinter
550 [[ -f "${myroot}/${f}" ]] && myfiles+=("${myroot}/${f}") 829 [[ -f "${myroot}/${f}" ]] && myfiles+=("${myroot}/${f}")
551 done 830 done
552 831
553 if ((${#myfiles[@]})); then 832 if ((${#myfiles[@]})); then
554 python${PYVER} ${myroot}/usr/$(get_libdir)/python${PYVER}/py_compile.py "${myfiles[@]}" 833 python${PYVER} ${myroot}/usr/$(get_libdir)/python${PYVER}/py_compile.py "${myfiles[@]}"
555 python${PYVER} -O ${myroot}/usr/$(get_libdir)/python${PYVER}/py_compile.py "${myfiles[@]}" 834 python${PYVER} -O ${myroot}/usr/$(get_libdir)/python${PYVER}/py_compile.py "${myfiles[@]}" &> /dev/null
556 else 835 else
557 ewarn "No files to compile!" 836 ewarn "No files to compile!"
558 fi 837 fi
559} 838}
560 839
608 else 887 else
609 ewarn "'${root}/$1' doesn't exist!" 888 ewarn "'${root}/$1' doesn't exist!"
610 fi 889 fi
611 else 890 else
612 for PYTHON_ABI in ${PYTHON_ABIS}; do 891 for PYTHON_ABI in ${PYTHON_ABIS}; do
613 if [[ -d "${root}/$(python_get_sitedir)/$1" ]]; then 892 if [[ -d "${root}$(python_get_sitedir)/$1" ]]; then
614 site_packages_dirs+=("$1") 893 site_packages_dirs+=("$1")
615 break 894 break
616 elif [[ -f "${root}/$(python_get_sitedir)/$1" ]]; then 895 elif [[ -f "${root}$(python_get_sitedir)/$1" ]]; then
617 site_packages_files+=("$1") 896 site_packages_files+=("$1")
618 break 897 break
619 elif [[ -e "${root}/$(python_get_sitedir)/$1" ]]; then 898 elif [[ -e "${root}$(python_get_sitedir)/$1" ]]; then
620 ewarn "'$1' is not a file or a directory!" 899 ewarn "'$1' is not a file or a directory!"
621 else 900 else
622 ewarn "'$1' doesn't exist!" 901 ewarn "'$1' doesn't exist!"
623 fi 902 fi
624 done 903 done
635 if ((${#site_packages_dirs[@]})) || ((${#site_packages_files[@]})); then 914 if ((${#site_packages_dirs[@]})) || ((${#site_packages_files[@]})); then
636 return_code="0" 915 return_code="0"
637 ebegin "Compilation and optimization of Python modules for Python ${PYTHON_ABI}" 916 ebegin "Compilation and optimization of Python modules for Python ${PYTHON_ABI}"
638 if ((${#site_packages_dirs[@]})); then 917 if ((${#site_packages_dirs[@]})); then
639 for dir in "${site_packages_dirs[@]}"; do 918 for dir in "${site_packages_dirs[@]}"; do
640 site_packages_absolute_dirs+=("${root}/$(python_get_sitedir)/${dir}") 919 site_packages_absolute_dirs+=("${root}$(python_get_sitedir)/${dir}")
641 done 920 done
642 "$(PYTHON)" "${root}/$(python_get_libdir)/compileall.py" "${options[@]}" "${site_packages_absolute_dirs[@]}" || return_code="1" 921 "$(PYTHON)" "${root}$(python_get_libdir)/compileall.py" "${options[@]}" "${site_packages_absolute_dirs[@]}" || return_code="1"
643 "$(PYTHON)" -O "${root}/$(python_get_libdir)/compileall.py" "${options[@]}" "${site_packages_absolute_dirs[@]}" || return_code="1" 922 "$(PYTHON)" -O "${root}$(python_get_libdir)/compileall.py" "${options[@]}" "${site_packages_absolute_dirs[@]}" &> /dev/null || return_code="1"
644 fi 923 fi
645 if ((${#site_packages_files[@]})); then 924 if ((${#site_packages_files[@]})); then
646 for file in "${site_packages_files[@]}"; do 925 for file in "${site_packages_files[@]}"; do
647 site_packages_absolute_files+=("${root}/$(python_get_sitedir)/${file}") 926 site_packages_absolute_files+=("${root}$(python_get_sitedir)/${file}")
648 done 927 done
649 "$(PYTHON)" "${root}/$(python_get_libdir)/py_compile.py" "${site_packages_absolute_files[@]}" || return_code="1" 928 "$(PYTHON)" "${root}$(python_get_libdir)/py_compile.py" "${site_packages_absolute_files[@]}" || return_code="1"
650 "$(PYTHON)" -O "${root}/$(python_get_libdir)/py_compile.py" "${site_packages_absolute_files[@]}" || return_code="1" 929 "$(PYTHON)" -O "${root}$(python_get_libdir)/py_compile.py" "${site_packages_absolute_files[@]}" &> /dev/null || return_code="1"
651 fi 930 fi
652 eend "${return_code}" 931 eend "${return_code}"
653 fi 932 fi
654 unset site_packages_absolute_dirs site_packages_absolute_files 933 unset site_packages_absolute_dirs site_packages_absolute_files
655 done 934 done
659 938
660 if ((${#other_dirs[@]})) || ((${#other_files[@]})); then 939 if ((${#other_dirs[@]})) || ((${#other_files[@]})); then
661 return_code="0" 940 return_code="0"
662 ebegin "Compilation and optimization of Python modules placed outside of site-packages directories for Python ${PYVER}..." 941 ebegin "Compilation and optimization of Python modules placed outside of site-packages directories for Python ${PYVER}..."
663 if ((${#other_dirs[@]})); then 942 if ((${#other_dirs[@]})); then
664 python${PYVER} "${root}/$(python_get_libdir)/compileall.py" "${options[@]}" "${other_dirs[@]}" || return_code="1" 943 python${PYVER} "${root}$(python_get_libdir)/compileall.py" "${options[@]}" "${other_dirs[@]}" || return_code="1"
665 python${PYVER} -O "${root}/$(python_get_libdir)/compileall.py" "${options[@]}" "${other_dirs[@]}" || return_code="1" 944 python${PYVER} -O "${root}$(python_get_libdir)/compileall.py" "${options[@]}" "${other_dirs[@]}" &> /dev/null || return_code="1"
666 fi 945 fi
667 if ((${#other_files[@]})); then 946 if ((${#other_files[@]})); then
668 python${PYVER} "${root}/$(python_get_libdir)/py_compile.py" "${other_files[@]}" || return_code="1" 947 python${PYVER} "${root}$(python_get_libdir)/py_compile.py" "${other_files[@]}" || return_code="1"
669 python${PYVER} -O "${root}/$(python_get_libdir)/py_compile.py" "${other_files[@]}" || return_code="1" 948 python${PYVER} -O "${root}$(python_get_libdir)/py_compile.py" "${other_files[@]}" &> /dev/null || return_code="1"
670 fi 949 fi
671 eend "${return_code}" 950 eend "${return_code}"
672 fi 951 fi
673 else 952 else
674 local myroot mydirs=() myfiles=() myopts=() 953 local myroot mydirs=() myfiles=() myopts=() return_code="0"
675 954
676 # strip trailing slash 955 # strip trailing slash
677 myroot="${ROOT%/}" 956 myroot="${ROOT%/}"
678 957
679 # respect ROOT and options passed to compileall.py 958 # respect ROOT and options passed to compileall.py
717 996
718 ebegin "Byte compiling python modules for python-${PYVER} .." 997 ebegin "Byte compiling python modules for python-${PYVER} .."
719 if ((${#mydirs[@]})); then 998 if ((${#mydirs[@]})); then
720 python${PYVER} \ 999 python${PYVER} \
721 "${myroot}"/usr/$(get_libdir)/python${PYVER}/compileall.py \ 1000 "${myroot}"/usr/$(get_libdir)/python${PYVER}/compileall.py \
722 "${myopts[@]}" "${mydirs[@]}" 1001 "${myopts[@]}" "${mydirs[@]}" || return_code="1"
723 python${PYVER} -O \ 1002 python${PYVER} -O \
724 "${myroot}"/usr/$(get_libdir)/python${PYVER}/compileall.py \ 1003 "${myroot}"/usr/$(get_libdir)/python${PYVER}/compileall.py \
725 "${myopts[@]}" "${mydirs[@]}" 1004 "${myopts[@]}" "${mydirs[@]}" &> /dev/null || return_code="1"
726 fi 1005 fi
727 1006
728 if ((${#myfiles[@]})); then 1007 if ((${#myfiles[@]})); then
729 python_mod_compile "${myfiles[@]}" 1008 python_mod_compile "${myfiles[@]}"
730 fi 1009 fi
731 1010
732 eend $? 1011 eend "${return_code}"
733 fi 1012 fi
734} 1013}
735 1014
736# @FUNCTION: python_mod_cleanup 1015# @FUNCTION: python_mod_cleanup
737# @USAGE: [directory] 1016# @USAGE: [directory]
760 die "${FUNCNAME} doesn't support absolute paths of directories/files in site-packages directories" 1039 die "${FUNCNAME} doesn't support absolute paths of directories/files in site-packages directories"
761 elif [[ "$1" =~ ^/ ]]; then 1040 elif [[ "$1" =~ ^/ ]]; then
762 SEARCH_PATH+=("${root}/${1#/}") 1041 SEARCH_PATH+=("${root}/${1#/}")
763 else 1042 else
764 for PYTHON_ABI in ${PYTHON_ABIS}; do 1043 for PYTHON_ABI in ${PYTHON_ABIS}; do
765 SEARCH_PATH+=("${root}/$(python_get_sitedir)/$1") 1044 SEARCH_PATH+=("${root}$(python_get_sitedir)/$1")
766 done 1045 done
767 fi 1046 fi
768 shift 1047 shift
769 done 1048 done
770 else 1049 else
774 else 1053 else
775 SEARCH_PATH=("${root}"/usr/lib*/python*/site-packages) 1054 SEARCH_PATH=("${root}"/usr/lib*/python*/site-packages)
776 fi 1055 fi
777 1056
778 for path in "${SEARCH_PATH[@]}"; do 1057 for path in "${SEARCH_PATH[@]}"; do
1058 [[ ! -d "${path}" ]] && continue
779 einfo "Cleaning orphaned Python bytecode from ${path} .." 1059 einfo "Cleaning orphaned Python bytecode from ${path} .."
780 find "${path}" -name '*.py[co]' -print0 | while read -rd ''; do 1060 find "${path}" -name '*.py[co]' -print0 | while read -rd ''; do
781 src_py="${REPLY%[co]}" 1061 src_py="${REPLY%[co]}"
782 [[ -f "${src_py}" ]] && continue 1062 [[ -f "${src_py}" || (! -f "${src_py}c" && ! -f "${src_py}o") ]] && continue
783 einfo "Purging ${src_py}[co]" 1063 einfo "Purging ${src_py}[co]"
784 rm -f "${src_py}"[co] 1064 rm -f "${src_py}"[co]
785 done 1065 done
786 1066
787 # Attempt to remove directories that may be empty. 1067 # Attempt to remove directories that may be empty.
788 find "${path}" -type d | sort -r | while read -r dir; do 1068 find "${path}" -type d | sort -r | while read -r dir; do
789 rmdir "${dir}" 2>/dev/null 1069 rmdir "${dir}" 2>/dev/null && einfo "Removing empty directory ${dir}"
790 done 1070 done
791 done 1071 done
792} 1072}

Legend:
Removed from v.1.60  
changed lines
  Added in v.1.77

  ViewVC Help
Powered by ViewVC 1.1.20