aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-01 16:26:35 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-01 16:26:35 +0100
commit486394e465990b9164bf50571d2ad075974624ed (patch)
treeaa251a7901054399af1615cd6744ec8e770858b4
parent21e52c4a3b4dcab7202bc60507a8cb4371726d88 (diff)
downloadpaludis-486394e465990b9164bf50571d2ad075974624ed.tar.gz
paludis-486394e465990b9164bf50571d2ad075974624ed.tar.xz
Don't ignore requested merger options
-rw-r--r--paludis/repositories/unpackaged/installed_repository.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/paludis/repositories/unpackaged/installed_repository.cc b/paludis/repositories/unpackaged/installed_repository.cc
index 05225f7..0a5fa91 100644
--- a/paludis/repositories/unpackaged/installed_repository.cc
+++ b/paludis/repositories/unpackaged/installed_repository.cc
@@ -359,7 +359,7 @@ InstalledUnpackagedRepository::merge(const MergeParams & m)
n::image() = m.image_dir(),
n::install_under() = install_under,
n::merged_entries() = make_shared_ptr(new FSEntrySet),
- n::options() = MergerOptions() + mo_rewrite_symlinks + mo_allow_empty_dirs,
+ n::options() = m.options(),
n::output_manager() = m.output_manager(),
n::package_id() = m.package_id(),
n::root() = installed_root_key()->value()