aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2008-02-01 00:39:11 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2008-02-01 00:39:11 +0000
commit3be6936fd3b39bd8c79af704a433e21f3f696f87 (patch)
tree46ee624cf9dd9667d091fd7bc4ddecfe3bf4a5aa
parentbbbe1389d57d3d5be50bf5f3883de194884aacf7 (diff)
downloadpaludis-3be6936fd3b39bd8c79af704a433e21f3f696f87.tar.gz
paludis-3be6936fd3b39bd8c79af704a433e21f3f696f87.tar.xz
Allow new phase functions to be exported from exlibs, and make it a fatal error to try to export something that shouldn't be.
-rwxr-xr-x[-rw-r--r--]paludis/repositories/e/ebuild/exheres-0/eclass_functions.bash5
-rwxr-xr-x[-rw-r--r--]paludis/repositories/e/ebuild/exheres-0/exlib_functions.bash5
2 files changed, 4 insertions, 6 deletions
diff --git a/paludis/repositories/e/ebuild/exheres-0/eclass_functions.bash b/paludis/repositories/e/ebuild/exheres-0/eclass_functions.bash
index 1e13085..ac77183 100644..100755
--- a/paludis/repositories/e/ebuild/exheres-0/eclass_functions.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/eclass_functions.bash
@@ -31,13 +31,12 @@ EXPORT_FUNCTIONS()
eval "${e}() { ${ECLASS}_${e} \"\$@\" ; }"
;;
- src_unpack|src_compile|src_install|src_test)
+ src_unpack|src_prepare|src_configure|src_compile|src_install|src_test)
eval "${e}() { ${ECLASS}_${e} \"\$@\" ; }"
;;
*)
- eval "${e}() { ${ECLASS}_${e} \"\$@\" ; }"
- ebuild_notice "qa" "$e should not be in EXPORT_FUNCTIONS for ${ECLASS}"
+ die "$e should not be in EXPORT_FUNCTIONS for ${ECLASS}"
;;
esac
done
diff --git a/paludis/repositories/e/ebuild/exheres-0/exlib_functions.bash b/paludis/repositories/e/ebuild/exheres-0/exlib_functions.bash
index f73b206..7fd495d 100644..100755
--- a/paludis/repositories/e/ebuild/exheres-0/exlib_functions.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/exlib_functions.bash
@@ -27,13 +27,12 @@ export_exlib_phases()
eval "${e}() { ${CURRENT_EXLIB}_${e} \"\$@\" ; }"
;;
- src_unpack|src_compile|src_install|src_test)
+ src_unpack|src_prepare|src_configure|src_compile|src_install|src_test)
eval "${e}() { ${CURRENT_EXLIB}_${e} \"\$@\" ; }"
;;
*)
- eval "${e}() { ${CURRENT_EXLIB}_${e} \"\$@\" ; }"
- ebuild_notice "qa" "$e should not be in export_exlib_phases for ${CURRENT_EXLIB}"
+ die "$e should not be in export_exlib_phases for ${CURRENT_EXLIB}"
;;
esac
done