aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-03-11 17:22:38 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-03-11 17:22:38 +0000
commit70560bba33ae694031068b245efd2f49caadb341 (patch)
tree098991f097da69346e814dce6791d26e02d3f6f8
parent41d546489a33c974081d64db37e6559b7cf91bf8 (diff)
downloadpaludis-70560bba33ae694031068b245efd2f49caadb341.tar.gz
paludis-70560bba33ae694031068b245efd2f49caadb341.tar.xz
Don't validate expandable requirements twice
-rw-r--r--paludis/repositories/e/myoptions_requirements_verifier.cc14
1 files changed, 14 insertions, 0 deletions
diff --git a/paludis/repositories/e/myoptions_requirements_verifier.cc b/paludis/repositories/e/myoptions_requirements_verifier.cc
index a82c8fe..6105e52 100644
--- a/paludis/repositories/e/myoptions_requirements_verifier.cc
+++ b/paludis/repositories/e/myoptions_requirements_verifier.cc
@@ -147,6 +147,20 @@ MyOptionsRequirementsVerifier::verify_one(
for (auto m(annotations->begin()), m_end(annotations->end()) ;
m != m_end ; ++m)
{
+ switch (m->kind())
+ {
+ case dsak_synthetic:
+ case dsak_expanded:
+ case dsak_literal:
+ break;
+
+ case dsak_expandable:
+ continue;
+
+ case last_dsak:
+ throw InternalError(PALUDIS_HERE, "bad dsak");
+ }
+
switch (m->role())
{
case dsar_myoptions_requires: