aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2007-09-19 09:53:34 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2007-09-19 09:53:34 +0000
commit045aa2034ad606b1850716c7cc25d85b3e6d3cae (patch)
tree7c86233dca2a4affec0a0c09f847157a20b7f8fe
parent4c2f7daf3adfe934985383f1700c9b9c2bf71351 (diff)
downloadpaludis-045aa2034ad606b1850716c7cc25d85b3e6d3cae.tar.gz
paludis-045aa2034ad606b1850716c7cc25d85b3e6d3cae.tar.xz
-* in keywords.conf isn't supposed to accept KEYWORDS="-*".
-rw-r--r--paludis/environments/paludis/keywords_conf.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/paludis/environments/paludis/keywords_conf.cc b/paludis/environments/paludis/keywords_conf.cc
index ea596fe..ba9f936 100644
--- a/paludis/environments/paludis/keywords_conf.cc
+++ b/paludis/environments/paludis/keywords_conf.cc
@@ -155,14 +155,14 @@ KeywordsConf::query(tr1::shared_ptr<const KeywordNameSet> k, const PackageID & e
for (KeywordsList::const_iterator l(j->second.begin()), l_end(j->second.end()) ;
l != l_end ; ++l)
{
- if (k->end() != k->find(*l))
- return true;
-
if (*l == star_keyword)
return true;
- if (*l == minus_star_keyword)
+ else if (*l == minus_star_keyword)
break_when_done = true;
+
+ else if (k->end() != k->find(*l))
+ return true;
}
}
}