aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-05-26 10:45:43 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-05-26 10:45:43 +0100
commit5a85237fb69e7a2b3d3fe64d0d41de08a34c8c97 (patch)
tree6c0ddccf836296d74f80a1194a1116db4946d5de
parent45d06ba65582f098eec0b1f15d07930c181aeff0 (diff)
downloadpaludis-5a85237fb69e7a2b3d3fe64d0d41de08a34c8c97.tar.gz
paludis-5a85237fb69e7a2b3d3fe64d0d41de08a34c8c97.tar.xz
Error check
-rw-r--r--paludis/repositories/e/vdb_repository.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/paludis/repositories/e/vdb_repository.cc b/paludis/repositories/e/vdb_repository.cc
index 6b1c9b5..bbfb257 100644
--- a/paludis/repositories/e/vdb_repository.cc
+++ b/paludis/repositories/e/vdb_repository.cc
@@ -966,6 +966,8 @@ VDBRepository::merge(const MergeParams & m)
if (is_replace)
{
/* hack: before we nuke its vdb dir, preload CONTENTS */
+ if (! is_replace->contents_key())
+ throw InternalError(PALUDIS_HERE, "No contents key in " + stringify(*is_replace) + ". How did that happen?");
is_replace->contents_key()->value();
FSEntry old_vdb_dir(_imp->params.location());