diff options
| author |  Bo Ørsted Andresen <zlin@exherbo.org>
| 2011-10-12 14:12:21 +0000 |
|---|---|---|
| committer | Bo Ørsted Andresen <zlin@exherbo.org>
| 2011-10-12 14:12:21 +0000 |
| commit | cac7bb5aa90885a9628f8cbbf37b16e11a20a9d1 (patch) | |
| tree | 6800c8b3dcec7345548c7a953a9f1d1efb6a8c14 | |
| parent | 972282bf23fb09fb9d2cd47f322dc576edda0a53 (diff) | |
| download | paludis-cac7bb5aa90885a9628f8cbbf37b16e11a20a9d1.tar.gz paludis-cac7bb5aa90885a9628f8cbbf37b16e11a20a9d1.tar.xz | |
Fix dying in require() when exlib phases don't get defined.
95c70705 would invalidly die when require() got called after
export_exlib_phases() but before the exported phase got defined.
| -rw-r--r-- | paludis/repositories/e/ebuild/exheres-0/exlib_functions.bash | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/paludis/repositories/e/ebuild/exheres-0/exlib_functions.bash b/paludis/repositories/e/ebuild/exheres-0/exlib_functions.bash index 911b66288..0ee74edc4 100644 --- a/paludis/repositories/e/ebuild/exheres-0/exlib_functions.bash +++ b/paludis/repositories/e/ebuild/exheres-0/exlib_functions.bash @@ -180,6 +180,8 @@ require() done local old_CURRENT_EXLIB="${CURRENT_EXLIB}" export CURRENT_EXLIB="${e}" + local old_PALUDIS_CHECK_EXPORTED_PHASES="${PALUDIS_CHECK_EXPORTED_PHASES}" + export PALUDIS_CHECK_EXPORTED_PHASES= alias exparam="exparam_internal ${CURRENT_EXLIB}" for v in ${PALUDIS_SOURCE_MERGED_VARIABLES} ${PALUDIS_BRACKET_MERGED_VARIABLES} ; do @@ -268,7 +270,7 @@ require() for v in ${PALUDIS_CHECK_EXPORTED_PHASES} ; do type -t ${v} >/dev/null || die "exported phase function ${v} does not exist" done - unset PALUDIS_CHECK_EXPORTED_PHASES + export PALUDIS_CHECK_EXPORTED_PHASES="${old_PALUDIS_CHECK_EXPORTED_PHASES}" export CURRENT_EXLIB="${old_CURRENT_EXLIB}" if [[ -n ${CURRENT_EXLIB} ]]; then |