diff options
| author | Jonathan Callen <abcd@gentoo.org> | 2009-10-07 21:33:44 -0400 |
|---|---|---|
| committer | Jonathan Callen <abcd@gentoo.org> | 2009-10-07 21:33:44 -0400 |
| commit | fd52ac7d208eb5fed50cbb532a654a2f38f1061a (patch) | |
| tree | 4783ffe98ffbf918ca6853ee09bb1ef2e0df0f23 /eclass/kde4-functions.eclass | |
| parent | a99dedfdef3bd79dedfe8026469c908d1b822c13 (diff) | |
| download | kde-fd52ac7d208eb5fed50cbb532a654a2f38f1061a.tar.gz kde-fd52ac7d208eb5fed50cbb532a654a2f38f1061a.tar.bz2 kde-fd52ac7d208eb5fed50cbb532a654a2f38f1061a.zip | |
[eclass] Fix logic in _do_blocker (missing case for ":SLOT"), and spellcheck comments
Diffstat (limited to 'eclass/kde4-functions.eclass')
| -rw-r--r-- | eclass/kde4-functions.eclass | 9 |
1 files changed, 4 insertions, 5 deletions
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 |