From fd52ac7d208eb5fed50cbb532a654a2f38f1061a Mon Sep 17 00:00:00 2001 From: Jonathan Callen Date: Wed, 7 Oct 2009 21:33:44 -0400 Subject: [eclass] Fix logic in _do_blocker (missing case for ":SLOT"), and spellcheck comments --- eclass/kde4-functions.eclass | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'eclass/kde4-functions.eclass') diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index 7845702df2a..9da034e84d6 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -450,7 +450,7 @@ _do_blocker() { if [[ ${param/:} == ${param} ]]; then def=${param} else # the parameter *does* have a ":" in it - # so everythin after the : is the slot... + # so everything after the : is the slot... slot=${param#*:} # ...and everything before the : is the version local block_${slot//./_}=${param%:*} @@ -464,10 +464,9 @@ _do_blocker() { # if we didn't pass *:${slot}, then use the unsloted value [[ ${!var} == "unset" ]] && var=def - # If the no version was passed, or the version is greater than the - # maximum possible version in this slot, block all versions in this - # slot - if [[ ${!var} == "unset" ]] || _greater_max_in_slot ${!var#<} ${slot}; then + # If no version was passed, or the version is greater than the maximum + # possible version in this slot, block all versions in this slot + if [[ ${!var} == "unset" ]] || [[ -z ${!var} ]] || _greater_max_in_slot ${!var#<} ${slot}; then atom=${pkg} # If the version is "0" or less than the minimum possible version in # this slot, do nothing -- cgit v1.2.3