aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2007-04-28 07:37:05 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2007-04-28 07:37:05 +0000
commit079a575ff6585bef45efde467a290eccbd7812c9 (patch)
tree29e402754f5748a1e38176d58a217c4192e16001
parent09cb491861117e8df631effef2e7cba6b295d6bc (diff)
downloadpaludis-079a575ff6585bef45efde467a290eccbd7812c9.tar.gz
paludis-079a575ff6585bef45efde467a290eccbd7812c9.tar.xz
Fix USE_EXPAND.
-rw-r--r--paludis/environments/paludis/use_conf.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/paludis/environments/paludis/use_conf.cc b/paludis/environments/paludis/use_conf.cc
index 503e58e..473743e 100644
--- a/paludis/environments/paludis/use_conf.cc
+++ b/paludis/environments/paludis/use_conf.cc
@@ -305,6 +305,7 @@ UseConf::known_use_expand_names(const UseFlagName & prefix, const PackageDatabas
std::tr1::shared_ptr<UseFlagNameCollection> result(new UseFlagNameCollection::Concrete);
std::string prefix_lower;
std::transform(prefix.data().begin(), prefix.data().end(), std::back_inserter(prefix_lower), &::tolower);
+ prefix_lower.append("_");
Qualified::const_iterator q(_imp->qualified.find(e.name));
if (_imp->qualified.end() != q)
@@ -315,7 +316,7 @@ UseConf::known_use_expand_names(const UseFlagName & prefix, const PackageDatabas
for (UseFlagWithStateMap::const_iterator i(p->second.first.begin()), i_end(p->second.first.end()) ;
i != i_end ; ++i)
- if (0 == i->first.data().compare(0, i->first.data().length(), stringify(prefix_lower), 0, i->first.data().length()))
+ if (0 == i->first.data().compare(0, prefix_lower.length(), prefix_lower))
result->insert(i->first);
}
@@ -337,7 +338,7 @@ UseConf::known_use_expand_names(const UseFlagName & prefix, const PackageDatabas
for (UseFlagWithStateMap::const_iterator i(r->second.second.first.begin()), i_end(r->second.second.first.end()) ;
i != i_end ; ++i)
- if (0 == i->first.data().compare(0, i->first.data().length(), stringify(prefix_lower), 0, i->first.data().length()))
+ if (0 == i->first.data().compare(0, prefix_lower.length(), prefix_lower))
result->insert(i->first);
}
@@ -348,7 +349,7 @@ UseConf::known_use_expand_names(const UseFlagName & prefix, const PackageDatabas
for (UseFlagWithStateMap::const_iterator i(p->second.first.begin()), i_end(p->second.first.end()) ;
i != i_end ; ++i)
- if (0 == i->first.data().compare(0, i->first.data().length(), stringify(prefix_lower), 0, i->first.data().length()))
+ if (0 == i->first.data().compare(0, prefix_lower.length(), prefix_lower))
result->insert(i->first);
}