aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e/ebuild/exheres-0
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-04-27 18:11:21 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-04-27 18:11:21 +0100
commita950df5854eef2dc6286deec2931d0d68f9a7b92 (patch)
treec9587349875fe4d01707c72b5667d282b4405b8c /paludis/repositories/e/ebuild/exheres-0
parent4ae48a93d3cff78807ee86bc13302d3ac410e2fa (diff)
downloadpaludis-a950df5854eef2dc6286deec2931d0d68f9a7b92.tar.gz
paludis-a950df5854eef2dc6286deec2931d0d68f9a7b92.tar.xz
EBUILD_PHASE is sometimes EXHERES_PHASE
Diffstat (limited to 'paludis/repositories/e/ebuild/exheres-0')
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/build_functions.bash12
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/exlib_functions.bash8
2 files changed, 10 insertions, 10 deletions
diff --git a/paludis/repositories/e/ebuild/exheres-0/build_functions.bash b/paludis/repositories/e/ebuild/exheres-0/build_functions.bash
index 4b1811f..6c6b36b 100644
--- a/paludis/repositories/e/ebuild/exheres-0/build_functions.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/build_functions.bash
@@ -37,8 +37,8 @@ is_nonfatal()
expatch()
{
- if [[ "${EBUILD_PHASE}" != "prepare" ]] ; then
- die "expatch called in EBUILD_PHASE ${EBUILD_PHASE}"
+ if [[ "${!PALUDIS_EBUILD_PHASE_VAR}" != "prepare" ]] ; then
+ die "expatch called in phase ${!PALUDIS_EBUILD_PHASE_VAR}"
fi
local recognise= patchlevel= options=() cmd= appliedpatches=0 dirpatches=()
@@ -97,8 +97,8 @@ expatch()
econf()
{
- if [[ "${EBUILD_PHASE}" != "configure" ]] ; then
- die "econf called in EBUILD_PHASE ${EBUILD_PHASE}"
+ if [[ "${!PALUDIS_EBUILD_PHASE_VAR}" != "configure" ]] ; then
+ die "econf called in phase ${!PALUDIS_EBUILD_PHASE_VAR}"
fi
local LOCAL_EXTRA_ECONF="${EXTRA_ECONF}"
@@ -168,8 +168,8 @@ econf()
einstall()
{
- if [[ "${EBUILD_PHASE}" != "install" ]] ; then
- die "einstall called in EBUILD_PHASE ${EBUILD_PHASE}"
+ if [[ "${!PALUDIS_EBUILD_PHASE_VAR}" != "install" ]] ; then
+ die "einstall called in phase ${!PALUDIS_EBUILD_PHASE_VAR}"
fi
if [[ -f Makefile ]] || [[ -f makefile ]] || [[ -f GNUmakefile ]] ; then
diff --git a/paludis/repositories/e/ebuild/exheres-0/exlib_functions.bash b/paludis/repositories/e/ebuild/exheres-0/exlib_functions.bash
index b72fe4e..769a9cd 100644
--- a/paludis/repositories/e/ebuild/exheres-0/exlib_functions.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/exlib_functions.bash
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2007, 2008 Ciaran McCreesh
+# Copyright (c) 2007, 2008, 2009 Ciaran McCreesh
# Copyright (c) 2009 Bo ├śrsted Andresen
#
# This file is part of the Paludis package manager. Paludis is free software;
@@ -227,7 +227,7 @@ require()
default()
{
- [[ $(type -t "default_$(paludis_phase_to_function_name "${EBUILD_PHASE}")" ) == "function" ]] || \
- die "default_$(paludis_phase_to_function_name "${EBUILD_PHASE}") is not a function"
- default_$(paludis_phase_to_function_name "${EBUILD_PHASE}") "$@"
+ [[ $(type -t "default_$(paludis_phase_to_function_name "${!PALUDIS_EBUILD_PHASE_VAR}")" ) == "function" ]] || \
+ die "default_$(paludis_phase_to_function_name "${!PALUDIS_EBUILD_PHASE_VAR}") is not a function"
+ default_$(paludis_phase_to_function_name "${!PALUDIS_EBUILD_PHASE_VAR}") "$@"
}