Refactor bashrc scripts sourcing
Creates two new helper functions __try_source and __source_env_files to simplify
__source_all_bashrcs.
(cherry picked from commit 60ee4deefb701d532fdd279caa989e7a6f4b8400)
Change-Id: Iafd66157ec3f29211b51ff1411b05c04622fd9c9
Reviewed-on: https://chromium-review.googlesource.com/225511
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Bertrand Simonnet <bsimonnet@chromium.org>
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index be044e0..14cc321 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -375,39 +375,64 @@
done
fi
- if [ -r "${PORTAGE_BASHRC}" ] ; then
- if [ "$PORTAGE_DEBUG" != "1" ] || [ "${-/x/}" != "$-" ]; then
- source "${PORTAGE_BASHRC}"
- else
- set -x
- source "${PORTAGE_BASHRC}"
- set +x
- fi
- fi
+ # The user's bashrc is the ONLY non-portage bit of code
+ # that can change shopts without a QA violation.
+ __try_source --no-qa "${PORTAGE_BASHRC}"
if [[ $EBUILD_PHASE != depend ]] ; then
- # The user's bashrc is the ONLY non-portage bit of code that can
- # change shopts without a QA violation.
- for x in "${PM_EBUILD_HOOK_DIR}"/${CATEGORY}/{${PN},${PN}:${SLOT%/*},${P},${PF}}; do
- if [ -r "${x}" ]; then
- # If $- contains x, then tracing has already been enabled
- # elsewhere for some reason. We preserve it's state so as
- # not to interfere.
- if [ "$PORTAGE_DEBUG" != "1" ] || [ "${-/x/}" != "$-" ]; then
- source "${x}"
- else
- set -x
- source "${x}"
- set +x
- fi
- fi
- done
+ __source_env_files --no-qa "${PM_EBUILD_HOOK_DIR}"
fi
[ ! -z "${OCC}" ] && export CC="${OCC}"
[ ! -z "${OCXX}" ] && export CXX="${OCXX}"
}
+# @FUNCTION: __source_env_files
+# @USAGE: [--no-qa] <ENV_DIRECTORY>
+# @DESCRIPTION:
+# Source the files relevant to the current package from the given path.
+# If --no-qa is specified, use source instead of __qa_source to source the
+# files.
+__source_env_files() {
+ local argument=()
+ if [[ $1 == --no-qa ]]; then
+ argument=( --no-qa )
+ shift
+ fi
+ for x in "${1}"/${CATEGORY}/{${PN},${PN}:${SLOT%/*},${P},${PF}}; do
+ __try_source "${argument[@]}" "${x}"
+ done
+}
+
+# @FUNCTION: __try_source
+# @USAGE: [--no-qa] <FILE>
+# @DESCRIPTION:
+# If the path given as argument exists, source the file while preserving
+# $-.
+# If --no-qa is specified, source the file with source instead of __qa_source.
+__try_source() {
+ local qa=true
+ if [[ $1 == --no-qa ]]; then
+ qa=false
+ shift
+ fi
+ if [[ -r "$1" ]]; then
+ local debug_on=false
+ if [[ "$PORTAGE_DEBUG" == "1" ]] && [[ "${-/x/}" == "$-" ]]; then
+ debug_on=true
+ fi
+ $debug_on && set -x
+ # If $- contains x, then tracing has already been enabled
+ # elsewhere for some reason. We preserve it's state so as
+ # not to interfere.
+ if [[ ${qa} ]]; then
+ source "${1}"
+ else
+ __qa_source "${1}"
+ fi
+ $debug_on && set +x
+ fi
+}
# === === === === === === === === === === === === === === === === === ===
# === === === === === functions end, main part begins === === === === ===
# === === === === === === === === === === === === === === === === === ===
diff --git a/bin/save-ebuild-env.sh b/bin/save-ebuild-env.sh
index 3702afa..c776f79 100644
--- a/bin/save-ebuild-env.sh
+++ b/bin/save-ebuild-env.sh
@@ -75,6 +75,7 @@
__ebuild_main __ebuild_phase __ebuild_phase_with_hooks \
__ebuild_arg_to_phase __ebuild_phase_funcs default \
__unpack_tar __unset_colors \
+ __source_env_files __try_source \
${QA_INTERCEPTORS}
___eapi_has_usex && unset -f usex
