aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e/vdb_unmerger.cc
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-12 14:08:53 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-12 14:08:53 +0100
commit271074eb112e276d5ba25f91785431911ee3443f (patch)
tree188d64e702626d9972e7aafcc13d2e3fe814ce9a /paludis/repositories/e/vdb_unmerger.cc
parentf25a66dadbe4a9fbb8331e9a4f14462341b40832 (diff)
downloadpaludis-271074eb112e276d5ba25f91785431911ee3443f.tar.gz
paludis-271074eb112e276d5ba25f91785431911ee3443f.tar.xz
Make use of override_contents for VDB
Diffstat (limited to 'paludis/repositories/e/vdb_unmerger.cc')
-rw-r--r--paludis/repositories/e/vdb_unmerger.cc6
1 files changed, 1 insertions, 5 deletions
diff --git a/paludis/repositories/e/vdb_unmerger.cc b/paludis/repositories/e/vdb_unmerger.cc
index e9ed59c7a..9178010db 100644
--- a/paludis/repositories/e/vdb_unmerger.cc
+++ b/paludis/repositories/e/vdb_unmerger.cc
@@ -191,11 +191,7 @@ namespace
void
VDBUnmerger::populate_unmerge_set()
{
- if (! _imp->options.package_id()->contents_key()->value())
- throw VDBUnmergerError("Id '" + stringify(*_imp->options.package_id()) + "' has no contents key");
-
- std::shared_ptr<const Contents> contents(_imp->options.package_id()->contents_key()->value());
- for (Contents::ConstIterator c(contents->begin()), c_end(contents->end()) ;
+ for (Contents::ConstIterator c(_imp->options.contents()->begin()), c_end(_imp->options.contents()->end()) ;
c != c_end ; ++c)
add_unmerge_entry(get_et(**c), *c);
}