diff options
| author | Brian Harring <ferringb@gmail.com> | 2012-09-13 21:41:04 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-09-13 23:55:44 -0700 |
| commit | a23d0f4432abcfd1ebe4f2a3961185ca653ff2e0 (patch) | |
| tree | 6f66e33e5bb0f93a9f06d8509a970db0620c01d5 /bin/ebuild-helpers | |
| parent | 25a5296f29bc7153fa29e2dfe8de9d08d40d9944 (diff) | |
| download | portage-a23d0f4432abcfd1ebe4f2a3961185ca653ff2e0.tar.gz portage-a23d0f4432abcfd1ebe4f2a3961185ca653ff2e0.tar.bz2 portage-a23d0f4432abcfd1ebe4f2a3961185ca653ff2e0.zip | |
Convert funcs of bashrc-functions.sh to __ prefixed namespace.
Diffstat (limited to 'bin/ebuild-helpers')
| -rwxr-xr-x | bin/ebuild-helpers/ecompressdir | 8 | ||||
| -rwxr-xr-x | bin/ebuild-helpers/prepstrip | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/bin/ebuild-helpers/ecompressdir b/bin/ebuild-helpers/ecompressdir index 6801a07d4..5ca0d3a35 100755 --- a/bin/ebuild-helpers/ecompressdir +++ b/bin/ebuild-helpers/ecompressdir @@ -133,7 +133,7 @@ decompressors=( ".lzma" "unxz -f" ) -multijob_init +__multijob_init for dir in "$@" ; do dir=${dir#/} @@ -161,14 +161,14 @@ for dir in "$@" ; do # ends up launching less compressors overall, so the overhead # of forking children ends up dominating. ( - multijob_child_init + __multijob_child_init funk_up_dir "decompress" "${decompressors[i]}" "${decompressors[i+1]}" ) & - multijob_post_fork + __multijob_post_fork : $(( ret |= $? )) done - multijob_finish + __multijob_finish : $(( ret |= $? )) # forcibly break all hard links as some compressors whine about it diff --git a/bin/ebuild-helpers/prepstrip b/bin/ebuild-helpers/prepstrip index 5f87482cd..2556ee240 100755 --- a/bin/ebuild-helpers/prepstrip +++ b/bin/ebuild-helpers/prepstrip @@ -62,7 +62,7 @@ prepstrip_sources_dir=${EPREFIX}/usr/src/debug/${CATEGORY}/${PF} type -P debugedit >/dev/null && debugedit_found=true || debugedit_found=false debugedit_warned=false -multijob_init +__multijob_init # Setup $T filesystem layout that we care about. tmpdir="${T}/prepstrip" @@ -206,7 +206,7 @@ if ! ${RESTRICT_binchecks} && ! ${RESTRICT_strip} ; then log=${tmpdir}/scanelf-already-stripped.log scanelf -yqRBF '#k%F' -k '!.symtab' "$@" | sed -e "s#^${ED}##" > "${log}" ( - multijob_child_init + __multijob_child_init qa_var="QA_PRESTRIPPED_${ARCH/-/_}" [[ -n ${!qa_var} ]] && QA_PRESTRIPPED="${!qa_var}" if [[ -n ${QA_PRESTRIPPED} && -s ${log} && \ @@ -228,7 +228,7 @@ if ! ${RESTRICT_binchecks} && ! ${RESTRICT_strip} ; then rm -f "${log}" fi ) & - multijob_post_fork + __multijob_post_fork fi # Now we look for unstripped binaries. @@ -242,7 +242,7 @@ do fi ( - multijob_child_init + __multijob_child_init f=$(file "${x}") || exit 0 [[ -z ${f} ]] && exit 0 @@ -292,12 +292,12 @@ do chmod u-w "${x}" fi ) & - multijob_post_fork + __multijob_post_fork done # With a bit more work, we could run the rsync processes below in # parallel, but not sure that'd be an overall improvement. -multijob_finish +__multijob_finish cd "${tmpdir}"/sources/ && cat * > "${tmpdir}/debug.sources" 2>/dev/null if [[ -s ${tmpdir}/debug.sources ]] && \ |