aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e/exndbam_repository.cc
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2008-02-11 01:40:51 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2008-02-11 01:40:51 +0000
commit7f5da5c6222c2311500886d61be1ed729078fdf4 (patch)
tree4a0b4ded406fedd0284680f47d6143cb633fa858 /paludis/repositories/e/exndbam_repository.cc
parent5f182fcbdc18a66abf61733d2149c5b34c96d9eb (diff)
downloadpaludis-7f5da5c6222c2311500886d61be1ed729078fdf4.tar.gz
paludis-7f5da5c6222c2311500886d61be1ed729078fdf4.tar.xz
Allow empty directory merge warning to be made an error, and do so for exheres-0.
Diffstat (limited to 'paludis/repositories/e/exndbam_repository.cc')
-rw-r--r--paludis/repositories/e/exndbam_repository.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/paludis/repositories/e/exndbam_repository.cc b/paludis/repositories/e/exndbam_repository.cc
index 480641a5f..075a118b6 100644
--- a/paludis/repositories/e/exndbam_repository.cc
+++ b/paludis/repositories/e/exndbam_repository.cc
@@ -264,7 +264,7 @@ ExndbamRepository::need_keys_added() const
}
void
-ExndbamRepository::merge(const MergeOptions & m)
+ExndbamRepository::merge(const MergeParams & m)
{
Context context("When merging '" + stringify(*m.package_id) + "' at '" + stringify(m.image_dir)
+ "' to Exndbam repository '" + stringify(name()) + "':");
@@ -327,14 +327,15 @@ ExndbamRepository::merge(const MergeOptions & m)
}
NDBAMMerger merger(
- NDBAMMergerOptions::create()
+ NDBAMMergerParams::create()
.environment(_imp->params.environment)
.image(m.image_dir)
.root(installed_root_key()->value())
.contents_file(target_ver_dir / "contents")
.config_protect(config_protect)
.config_protect_mask(config_protect_mask)
- .package_id(m.package_id));
+ .package_id(m.package_id)
+ .options(m.options));
if (! merger.check())
{