aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-08-27 14:58:59 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-08-27 14:59:12 +0100
commit4b9abbe51e5d3b8981c9e5356947af9820eeafcd (patch)
treed95aa9d0b8151cd0d408011ee32e5515bbebbadf
parentdbddaed0d62ba8c806640bd2fdffeb7aef282498 (diff)
downloadpaludis-4b9abbe51e5d3b8981c9e5356947af9820eeafcd.tar.gz
paludis-4b9abbe51e5d3b8981c9e5356947af9820eeafcd.tar.xz
Make src_fetch_extra usable
-rw-r--r--paludis/repositories/e/eapis/exheres-0.conf2
-rwxr-xr-xpaludis/repositories/e/ebuild/ebuild.bash2
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/src_fetch_extra.bash2
3 files changed, 2 insertions, 4 deletions
diff --git a/paludis/repositories/e/eapis/exheres-0.conf b/paludis/repositories/e/eapis/exheres-0.conf
index 594e790..1e190ce 100644
--- a/paludis/repositories/e/eapis/exheres-0.conf
+++ b/paludis/repositories/e/eapis/exheres-0.conf
@@ -165,7 +165,7 @@ ebuild_nofetch = \
: tidyup
ebuild_fetch_extra = \
- skipname=fetch_extra skipifno=fetch_extra sydbox : fetch_extra
+ skipname=fetch_extra skipifno=fetch_extra sydbox userpriv : fetch_extra
ebuild_variable = \
sydbox userpriv : variable
diff --git a/paludis/repositories/e/ebuild/ebuild.bash b/paludis/repositories/e/ebuild/ebuild.bash
index 47ae43b..1c061fa 100755
--- a/paludis/repositories/e/ebuild/ebuild.bash
+++ b/paludis/repositories/e/ebuild/ebuild.bash
@@ -548,7 +548,7 @@ ebuild_main()
done
if [[ $1 == metadata ]] || [[ $1 == variable ]] || [[ $1 == pretend ]] || \
- [[ $1 == bad_options ]] ; then
+ [[ $1 == bad_options ]] || [[ $1 == fetch_extra ]] ; then
export ${PALUDIS_EBUILD_PHASE_VAR}="${1}"
perform_hook ebuild_${action}_pre
if [[ $1 == metadata ]]; then
diff --git a/paludis/repositories/e/ebuild/exheres-0/src_fetch_extra.bash b/paludis/repositories/e/ebuild/exheres-0/src_fetch_extra.bash
index 5b688a8..cd83cb6 100644
--- a/paludis/repositories/e/ebuild/exheres-0/src_fetch_extra.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/src_fetch_extra.bash
@@ -28,8 +28,6 @@ src_fetch_extra()
exheres_internal_fetch_extra()
{
- cd "${WORK}" || die "cd to \${WORK} (\"${WORK}\") failed"
-
if hasq "fetch_extra" ${SKIP_FUNCTIONS} ; then
ebuild_section "Skipping src_fetch_extra (SKIP_FUNCTIONS)"
else