aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-26 17:14:57 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-28 10:11:26 +0100
commitce13a6f9defe83fccd8424027ef1e24ca33b8cc2 (patch)
treebe57dccfba4c2e6a3f574f1d9000f85a2d09fe8c /paludis/repositories/e
parentd03893141379f242baf6ccbe0e934ebabd1ce626 (diff)
downloadpaludis-ce13a6f9defe83fccd8424027ef1e24ca33b8cc2.tar.gz
paludis-ce13a6f9defe83fccd8424027ef1e24ca33b8cc2.tar.xz
Add Merger base class
Diffstat (limited to 'paludis/repositories/e')
-rw-r--r--paludis/repositories/e/e_repository.cc2
-rw-r--r--paludis/repositories/e/eapi.cc4
-rw-r--r--paludis/repositories/e/eapi.hh4
-rw-r--r--paludis/repositories/e/ebuild.hh2
-rw-r--r--paludis/repositories/e/vdb_merger.hh2
-rw-r--r--paludis/repositories/e/vdb_merger_TEST.cc2
6 files changed, 8 insertions, 8 deletions
diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc
index 4ae38804f..c15700f58 100644
--- a/paludis/repositories/e/e_repository.cc
+++ b/paludis/repositories/e/e_repository.cc
@@ -2389,7 +2389,7 @@ ERepository::install(const std::shared_ptr<const ERepositoryID> & id,
+ "' to destination '" + stringify(install_action.options.destination()->name())
+ "' because destination does not provide destination_interface");
- FSMergerOptions extra_merger_options;
+ MergerOptions extra_merger_options;
if (preserve_work_choice && preserve_work_choice->enabled())
extra_merger_options += mo_nondestructive;
diff --git a/paludis/repositories/e/eapi.cc b/paludis/repositories/e/eapi.cc
index 31d4ba6b0..bcbbdc20e 100644
--- a/paludis/repositories/e/eapi.cc
+++ b/paludis/repositories/e/eapi.cc
@@ -305,14 +305,14 @@ namespace
version_spec_options += destringify<VersionSpecOption>(*t);
}
- FSMergerOptions merger_options;
+ MergerOptions merger_options;
{
std::list<std::string> merger_options_tokens;
tokenise_whitespace(check_get(k, "merger_options"), std::back_inserter(merger_options_tokens));
for (std::list<std::string>::const_iterator t(merger_options_tokens.begin()),
t_end(merger_options_tokens.end()) ;
t != t_end ; ++t)
- merger_options += destringify<FSMergerOption>(*t);
+ merger_options += destringify<MergerOption>(*t);
}
return std::make_shared<SupportedEAPI>(make_named_values<SupportedEAPI>(
diff --git a/paludis/repositories/e/eapi.hh b/paludis/repositories/e/eapi.hh
index 8029fec96..ffee931a3 100644
--- a/paludis/repositories/e/eapi.hh
+++ b/paludis/repositories/e/eapi.hh
@@ -30,7 +30,7 @@
#include <paludis/util/singleton.hh>
#include <paludis/name.hh>
#include <paludis/dep_spec-fwd.hh>
-#include <paludis/fs_merger-fwd.hh>
+#include <paludis/merger-fwd.hh>
#include <memory>
namespace paludis
@@ -272,7 +272,7 @@ namespace paludis
NamedValue<n::ebuild_options, std::shared_ptr<const EAPIEbuildOptions> > ebuild_options;
NamedValue<n::ebuild_phases, std::shared_ptr<const EAPIEbuildPhases> > ebuild_phases;
NamedValue<n::iuse_flag_parse_options, IUseFlagParseOptions> iuse_flag_parse_options;
- NamedValue<n::merger_options, FSMergerOptions> merger_options;
+ NamedValue<n::merger_options, MergerOptions> merger_options;
NamedValue<n::package_dep_spec_parse_options, ELikePackageDepSpecOptions> package_dep_spec_parse_options;
NamedValue<n::pipe_commands, std::shared_ptr<const EAPIPipeCommands> > pipe_commands;
NamedValue<n::tools_options, std::shared_ptr<const EAPIToolsOptions> > tools_options;
diff --git a/paludis/repositories/e/ebuild.hh b/paludis/repositories/e/ebuild.hh
index 396420652..5c49518c0 100644
--- a/paludis/repositories/e/ebuild.hh
+++ b/paludis/repositories/e/ebuild.hh
@@ -303,7 +303,7 @@ namespace paludis
NamedValue<n::environment_file, FSEntry> environment_file;
NamedValue<n::image, FSEntry> image;
NamedValue<n::maybe_output_manager, std::shared_ptr<OutputManager> > maybe_output_manager;
- NamedValue<n::merger_options, FSMergerOptions> merger_options;
+ NamedValue<n::merger_options, MergerOptions> merger_options;
NamedValue<n::package_id, std::shared_ptr<const erepository::ERepositoryID> > package_id;
};
diff --git a/paludis/repositories/e/vdb_merger.hh b/paludis/repositories/e/vdb_merger.hh
index 208a2e815..8ac3e3627 100644
--- a/paludis/repositories/e/vdb_merger.hh
+++ b/paludis/repositories/e/vdb_merger.hh
@@ -61,7 +61,7 @@ namespace paludis
NamedValue<n::fix_mtimes_before, Timestamp> fix_mtimes_before;
NamedValue<n::image, FSEntry> image;
NamedValue<n::merged_entries, std::shared_ptr<FSEntrySet> > merged_entries;
- NamedValue<n::options, FSMergerOptions> options;
+ NamedValue<n::options, MergerOptions> options;
NamedValue<n::output_manager, std::shared_ptr<OutputManager> > output_manager;
NamedValue<n::package_id, std::shared_ptr<const PackageID> > package_id;
NamedValue<n::root, FSEntry> root;
diff --git a/paludis/repositories/e/vdb_merger_TEST.cc b/paludis/repositories/e/vdb_merger_TEST.cc
index b29458717..63f31f69b 100644
--- a/paludis/repositories/e/vdb_merger_TEST.cc
+++ b/paludis/repositories/e/vdb_merger_TEST.cc
@@ -86,7 +86,7 @@ namespace
n::fix_mtimes_before() = Timestamp(0, 0),
n::image() = FSEntry::cwd() / "vdb_merger_TEST_dir" / what / "image",
n::merged_entries() = std::make_shared<FSEntrySet>(),
- n::options() = FSMergerOptions() + mo_rewrite_symlinks + mo_allow_empty_dirs,
+ n::options() = MergerOptions() + mo_rewrite_symlinks + mo_allow_empty_dirs,
n::output_manager() = std::make_shared<StandardOutputManager>(),
n::package_id() = std::shared_ptr<PackageID>(),
n::root() = root_dir