aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-02-06 20:47:57 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-02-06 20:47:57 +0000
commit7baffcaec4696b62b10ca39cd22d59cc87b20ad6 (patch)
tree741046deff4a2463a55f20a62da96e1395fd7375
parent69612ab816a7e3832f5ae053bd55c40c367bc7d8 (diff)
downloadpaludis-7baffcaec4696b62b10ca39cd22d59cc87b20ad6.tar.gz
paludis-7baffcaec4696b62b10ca39cd22d59cc87b20ad6.tar.xz
Use OutputManager for merges too.
-rw-r--r--paludis/repositories/accounts/accounts_id.cc1
-rw-r--r--paludis/repositories/e/ebuild_entries.cc1
-rw-r--r--paludis/repositories/unpackaged/unpackaged_id.cc1
-rw-r--r--paludis/repository.hh2
4 files changed, 5 insertions, 0 deletions
diff --git a/paludis/repositories/accounts/accounts_id.cc b/paludis/repositories/accounts/accounts_id.cc
index 2f4b6a8..1188642 100644
--- a/paludis/repositories/accounts/accounts_id.cc
+++ b/paludis/repositories/accounts/accounts_id.cc
@@ -441,6 +441,7 @@ AccountsID::perform_action(Action & action) const
value_for<n::environment_file>(FSEntry("/dev/null")),
value_for<n::image_dir>(fs_location_key()->value()),
value_for<n::options>(MergerOptions() + mo_rewrite_symlinks + mo_allow_empty_dirs),
+ value_for<n::output_manager>(install_action->options.output_manager()),
value_for<n::package_id>(shared_from_this()),
value_for<n::used_this_for_config_protect>(install_action->options.used_this_for_config_protect())
));
diff --git a/paludis/repositories/e/ebuild_entries.cc b/paludis/repositories/e/ebuild_entries.cc
index b1e3522..690c1b5 100644
--- a/paludis/repositories/e/ebuild_entries.cc
+++ b/paludis/repositories/e/ebuild_entries.cc
@@ -662,6 +662,7 @@ EbuildEntries::install(const std::tr1::shared_ptr<const ERepositoryID> & id,
value_for<n::image_dir>(_imp->params.builddir() / (stringify(id->name().category()) + "-" +
stringify(id->name().package()) + "-" + stringify(id->version())) / "image"),
value_for<n::options>(id->eapi()->supported()->merger_options()),
+ value_for<n::output_manager>(o.output_manager()),
value_for<n::package_id>(id),
value_for<n::used_this_for_config_protect>(o.used_this_for_config_protect())
));
diff --git a/paludis/repositories/unpackaged/unpackaged_id.cc b/paludis/repositories/unpackaged/unpackaged_id.cc
index 0564621..9ca31f0 100644
--- a/paludis/repositories/unpackaged/unpackaged_id.cc
+++ b/paludis/repositories/unpackaged/unpackaged_id.cc
@@ -347,6 +347,7 @@ UnpackagedID::perform_action(Action & action) const
value_for<n::environment_file>(FSEntry("/dev/null")),
value_for<n::image_dir>(fs_location_key()->value()),
value_for<n::options>(MergerOptions() + mo_rewrite_symlinks + mo_allow_empty_dirs),
+ value_for<n::output_manager>(install_action->options.output_manager()),
value_for<n::package_id>(shared_from_this()),
value_for<n::used_this_for_config_protect>(install_action->options.used_this_for_config_protect())
));
diff --git a/paludis/repository.hh b/paludis/repository.hh
index 936d14c..2d2e25a 100644
--- a/paludis/repository.hh
+++ b/paludis/repository.hh
@@ -66,6 +66,7 @@ namespace paludis
struct manifest_interface;
struct mirrors_interface;
struct options;
+ struct output_manager;
struct package_id;
struct path;
struct profile;
@@ -160,6 +161,7 @@ namespace paludis
NamedValue<n::environment_file, FSEntry> environment_file;
NamedValue<n::image_dir, FSEntry> image_dir;
NamedValue<n::options, MergerOptions> options;
+ NamedValue<n::output_manager, std::tr1::shared_ptr<OutputManager> > output_manager;
NamedValue<n::package_id, std::tr1::shared_ptr<const PackageID> > package_id;
NamedValue<n::used_this_for_config_protect, std::tr1::function<void (const std::string &)> > used_this_for_config_protect;
};