aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-07-13 20:52:07 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-07-13 20:52:07 +0100
commitaba5f452dab09cdfc70ae84cdcc95214d6e0edd4 (patch)
treea5cda359677ea5ae5cb5be7a26f176a5001932c8
parent1c5063b3536080daf1928ad87793e75eb413edf4 (diff)
downloadpaludis-aba5f452dab09cdfc70ae84cdcc95214d6e0edd4.tar.gz
paludis-aba5f452dab09cdfc70ae84cdcc95214d6e0edd4.tar.xz
Don't make unnecessary ( ) blocks for merged vars
-rwxr-xr-xpaludis/repositories/e/ebuild/ebuild.bash1
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/exlib_functions.bash1
-rwxr-xr-xpaludis/repositories/e/ebuild_flat_metadata_cache_TEST_setup.sh4
3 files changed, 4 insertions, 2 deletions
diff --git a/paludis/repositories/e/ebuild/ebuild.bash b/paludis/repositories/e/ebuild/ebuild.bash
index 6807154..351a951 100755
--- a/paludis/repositories/e/ebuild/ebuild.bash
+++ b/paludis/repositories/e/ebuild/ebuild.bash
@@ -337,6 +337,7 @@ 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
eval ${paludis_v}='"( ${!paludis_v} ) [[ '\
diff --git a/paludis/repositories/e/ebuild/exheres-0/exlib_functions.bash b/paludis/repositories/e/ebuild/exheres-0/exlib_functions.bash
index 4420624..a7c0595 100644
--- a/paludis/repositories/e/ebuild/exheres-0/exlib_functions.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/exlib_functions.bash
@@ -173,6 +173,7 @@ 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
export -n ${e_v}="${!e_v} ( ${!v} ) [[ ${PALUDIS_BRACKET_MERGED_VARIABLES_ANNOTATION} =
diff --git a/paludis/repositories/e/ebuild_flat_metadata_cache_TEST_setup.sh b/paludis/repositories/e/ebuild_flat_metadata_cache_TEST_setup.sh
index 0f01971..a5054fc 100755
--- a/paludis/repositories/e/ebuild_flat_metadata_cache_TEST_setup.sh
+++ b/paludis/repositories/e/ebuild_flat_metadata_cache_TEST_setup.sh
@@ -1293,13 +1293,13 @@ cat <<END > cache/expected/cat/write-exlibs-1
_mtime_=60
_guessed_eapi_=exheres-0
_exlibs_=bar $(${PALUDIS_EBUILD_DIR}/utils/canonicalise repo/cat/exlibs) 180 foo $(${PALUDIS_EBUILD_DIR}/utils/canonicalise repo/exlibs) 180
-DEPENDENCIES=( build: cat/foo bar? ( cat/bar ) ) [[ defined-in = [ write-exlibs-1.ebuild ] ]] ( cat/baz ) [[ defined-in = [ foo.exlib ] ]] ( ) [[ defined-in = [ bar.exlib ] ]]
+DEPENDENCIES=( build: cat/foo bar? ( cat/bar ) ) [[ defined-in = [ write-exlibs-1.ebuild ] ]] ( cat/baz ) [[ defined-in = [ foo.exlib ] ]]
SLOT=0
HOMEPAGE=http://example.com/
LICENCES=GPL-2
SUMMARY=A nice package
PLATFORMS=test
-MYOPTIONS=( bar ) [[ defined-in = [ write-exlibs-1.ebuild ] ]] ( quux ) [[ defined-in = [ foo.exlib ] ]] ( ) [[ defined-in = [ bar.exlib ] ]]
+MYOPTIONS=( bar ) [[ defined-in = [ write-exlibs-1.ebuild ] ]] ( quux ) [[ defined-in = [ foo.exlib ] ]]
EAPI=exheres-0
DEFINED_PHASES=-
END