aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-07-14 08:12:47 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-07-14 03:31:25 +0100
commitccc738a987ae77504825961fb65e98e176049fee (patch)
tree01348abd9fb6b9a1ee99d5b78171df80e200a4e8
parentaba5f452dab09cdfc70ae84cdcc95214d6e0edd4 (diff)
downloadpaludis-ccc738a987ae77504825961fb65e98e176049fee.tar.gz
paludis-ccc738a987ae77504825961fb65e98e176049fee.tar.xz
blech
-rwxr-xr-xpaludis/repositories/e/ebuild/ebuild.bash5
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/exlib_functions.bash5
2 files changed, 6 insertions, 4 deletions
diff --git a/paludis/repositories/e/ebuild/ebuild.bash b/paludis/repositories/e/ebuild/ebuild.bash
index 351a951..bc8d522 100755
--- a/paludis/repositories/e/ebuild/ebuild.bash
+++ b/paludis/repositories/e/ebuild/ebuild.bash
@@ -337,9 +337,10 @@ ebuild_load_ebuild()
done
for paludis_v in ${PALUDIS_BRACKET_MERGED_VARIABLES} ; do
- [[ -z "${!paludis_v}" ]] && continue
paludis_e_v=E_${paludis_v}
- if has "${paludis_v}" ${PALUDIS_BRACKET_MERGED_VARIABLES_ANNOTATABLE} ; then
+ if [[ -z "${!paludis_v}" ]] ; then
+ eval ${paludis_v}='"${!paludis_e_v}"'
+ elif has "${paludis_v}" ${PALUDIS_BRACKET_MERGED_VARIABLES_ANNOTATABLE} ; then
eval ${paludis_v}='"( ${!paludis_v} ) [[ '\
${PALUDIS_BRACKET_MERGED_VARIABLES_ANNOTATION}' = [ '${1##*/}' ] ]] ${!paludis_e_v}"'
else
diff --git a/paludis/repositories/e/ebuild/exheres-0/exlib_functions.bash b/paludis/repositories/e/ebuild/exheres-0/exlib_functions.bash
index a7c0595..37f5d95 100644
--- a/paludis/repositories/e/ebuild/exheres-0/exlib_functions.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/exlib_functions.bash
@@ -173,9 +173,10 @@ require()
done
for v in ${PALUDIS_BRACKET_MERGED_VARIABLES} ; do
- [[ -z "${!v}" ]] && continue
local e_v="E_${v}"
- if has "${v}" ${PALUDIS_BRACKET_MERGED_VARIABLES_ANNOTATABLE} ; then
+ if [[ -z "${!v}" ]] ; then
+ export -n ${e_v}="${!e_v}"
+ elif has "${v}" ${PALUDIS_BRACKET_MERGED_VARIABLES_ANNOTATABLE} ; then
export -n ${e_v}="${!e_v} ( ${!v} ) [[ ${PALUDIS_BRACKET_MERGED_VARIABLES_ANNOTATION} =
[ ${CURRENT_EXLIB}.exlib ] ]]"
else