aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2008-04-24 20:09:15 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2008-04-24 20:09:15 +0000
commit99d16b895b86271b3a2f85fbe200f1357149868f (patch)
treef090d0b91e5ca8a1da805d8991354a2761750a4e
parent7020f103c0a7ecc5c56fa41205bec11497321149 (diff)
downloadpaludis-99d16b895b86271b3a2f85fbe200f1357149868f.tar.gz
paludis-99d16b895b86271b3a2f85fbe200f1357149868f.tar.xz
Fix errors/bad behaviour with the built-in sets and asterisk suffixes.
-rw-r--r--paludis/repositories/e/e_repository_sets.cc13
1 files changed, 7 insertions, 6 deletions
diff --git a/paludis/repositories/e/e_repository_sets.cc b/paludis/repositories/e/e_repository_sets.cc
index 9e7f0f1..0b06104 100644
--- a/paludis/repositories/e/e_repository_sets.cc
+++ b/paludis/repositories/e/e_repository_sets.cc
@@ -94,15 +94,16 @@ ERepositorySets::package_set(const SetName & ss) const
{
using namespace tr1::placeholders;
- std::pair<SetName, SetFileSetOperatorMode> s(find_base_set_name_and_suffix_mode(ss));
-
- if ("system" == s.first.data())
+ if ("system" == ss.data())
throw InternalError(PALUDIS_HERE, "system set should've been handled by ERepository");
- else if ("security" == s.first.data())
+ else if ("security" == ss.data())
return security_set(false);
- else if ("insecurity" == s.first.data())
+ else if ("insecurity" == ss.data())
return security_set(true);
- else if ((_imp->params.setsdir / (stringify(s.first) + ".conf")).exists())
+
+ std::pair<SetName, SetFileSetOperatorMode> s(find_base_set_name_and_suffix_mode(ss));
+
+ if ((_imp->params.setsdir / (stringify(s.first) + ".conf")).exists())
{
tr1::shared_ptr<GeneralSetDepTag> tag(new GeneralSetDepTag(ss, stringify(_imp->e_repository->name())));