aboutsummaryrefslogtreecommitdiff
path: root/paludis/ndbam_merger.hh
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-08-24 13:28:45 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-08-24 15:47:41 +0100
commit49750cc61904ba17060521bd345c6ae526fb1bf8 (patch)
tree8aa8c06a7d6ec58c62dd0741011e8357a19c8b8d /paludis/ndbam_merger.hh
parent75f48bbb1ae368febe984c10c2db2d0b5cbd7cec (diff)
downloadpaludis-49750cc61904ba17060521bd345c6ae526fb1bf8.tar.gz
paludis-49750cc61904ba17060521bd345c6ae526fb1bf8.tar.xz
FSEntry -> FSPath, FSStat
Fixes: ticket:967
Diffstat (limited to 'paludis/ndbam_merger.hh')
-rw-r--r--paludis/ndbam_merger.hh26
1 files changed, 13 insertions, 13 deletions
diff --git a/paludis/ndbam_merger.hh b/paludis/ndbam_merger.hh
index 04ac67d..81a2ba3 100644
--- a/paludis/ndbam_merger.hh
+++ b/paludis/ndbam_merger.hh
@@ -49,17 +49,17 @@ namespace paludis
{
NamedValue<n::config_protect, std::string> config_protect;
NamedValue<n::config_protect_mask, std::string> config_protect_mask;
- NamedValue<n::contents_file, FSEntry> contents_file;
+ NamedValue<n::contents_file, FSPath> contents_file;
NamedValue<n::environment, Environment *> environment;
NamedValue<n::fix_mtimes_before, Timestamp> fix_mtimes_before;
- NamedValue<n::get_new_ids_or_minus_one, std::function<std::pair<uid_t, gid_t> (const FSEntry &)> > get_new_ids_or_minus_one;
- NamedValue<n::image, FSEntry> image;
- NamedValue<n::install_under, FSEntry> install_under;
- NamedValue<n::merged_entries, std::shared_ptr<FSEntrySet> > merged_entries;
+ NamedValue<n::get_new_ids_or_minus_one, std::function<std::pair<uid_t, gid_t> (const FSPath &)> > get_new_ids_or_minus_one;
+ NamedValue<n::image, FSPath> image;
+ NamedValue<n::install_under, FSPath> install_under;
+ NamedValue<n::merged_entries, std::shared_ptr<FSPathSet> > merged_entries;
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;
+ NamedValue<n::root, FSPath> root;
};
/**
@@ -84,17 +84,17 @@ namespace paludis
virtual Hook extend_hook(const Hook &);
- virtual void record_install_file(const FSEntry &, const FSEntry &, const std::string &, const FSMergerStatusFlags &);
- virtual void record_install_dir(const FSEntry &, const FSEntry &, const FSMergerStatusFlags &);
- virtual void record_install_under_dir(const FSEntry &, const FSMergerStatusFlags &);
- virtual void record_install_sym(const FSEntry &, const FSEntry &, const FSMergerStatusFlags &);
+ virtual void record_install_file(const FSPath &, const FSPath &, const std::string &, const FSMergerStatusFlags &);
+ virtual void record_install_dir(const FSPath &, const FSPath &, const FSMergerStatusFlags &);
+ virtual void record_install_under_dir(const FSPath &, const FSMergerStatusFlags &);
+ virtual void record_install_sym(const FSPath &, const FSPath &, const FSMergerStatusFlags &);
virtual void on_error(bool is_check, const std::string &);
virtual void on_warn(bool is_check, const std::string &);
- virtual void on_enter_dir(bool is_check, const FSEntry);
+ virtual void on_enter_dir(bool is_check, const FSPath);
- virtual bool config_protected(const FSEntry &, const FSEntry &);
- virtual std::string make_config_protect_name(const FSEntry &, const FSEntry &);
+ virtual bool config_protected(const FSPath &, const FSPath &);
+ virtual std::string make_config_protect_name(const FSPath &, const FSPath &);
virtual void merge();
virtual bool check();