aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e/vdb_unmerger.hh
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-02-16 00:16:26 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-02-16 00:16:26 +0000
commitba066f45df8b0ee431f8f836b6ad789428132828 (patch)
treee4738aa7fee81bed9db67d10d60fa34ea94ff41d /paludis/repositories/e/vdb_unmerger.hh
parentca35d755e3758ea2a6e96c8640182af2f809ae45 (diff)
downloadpaludis-ba066f45df8b0ee431f8f836b6ad789428132828.tar.gz
paludis-ba066f45df8b0ee431f8f836b6ad789428132828.tar.xz
Give contents entries metadata keys.
This lets us remove the horrible ExtraInfo hack from the unmerger. Whilst we're at it, stop tracking fifo / dev / misc and just have an 'other' contents type.
Diffstat (limited to 'paludis/repositories/e/vdb_unmerger.hh')
-rw-r--r--paludis/repositories/e/vdb_unmerger.hh13
1 files changed, 4 insertions, 9 deletions
diff --git a/paludis/repositories/e/vdb_unmerger.hh b/paludis/repositories/e/vdb_unmerger.hh
index d09aa9730..858ced505 100644
--- a/paludis/repositories/e/vdb_unmerger.hh
+++ b/paludis/repositories/e/vdb_unmerger.hh
@@ -34,7 +34,6 @@ namespace paludis
{
struct config_protect;
struct config_protect_mask;
- struct contents_file;
struct environment;
struct output_manager;
struct package_id;
@@ -52,7 +51,6 @@ 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::environment, Environment *> environment;
NamedValue<n::output_manager, std::tr1::shared_ptr<OutputManager> > output_manager;
NamedValue<n::package_id, std::tr1::shared_ptr<const PackageID> > package_id;
@@ -90,9 +88,6 @@ namespace paludis
{
private:
Implementation<VDBUnmerger> * _imp;
- class FileExtraInfo;
- class SymlinkExtraInfo;
- class MiscExtraInfo;
protected:
bool config_protected(const FSEntry &) const;
@@ -102,10 +97,10 @@ namespace paludis
void display(const std::string &) const;
- bool check_file(const FSEntry &, const std::tr1::shared_ptr<ExtraInfo> &) const;
- bool check_dir(const FSEntry &, const std::tr1::shared_ptr<ExtraInfo> &) const;
- bool check_sym(const FSEntry &, const std::tr1::shared_ptr<ExtraInfo> &) const;
- bool check_misc(const FSEntry &, const std::tr1::shared_ptr<ExtraInfo> &) const;
+ bool check_file(const std::tr1::shared_ptr<const ContentsEntry> &) const;
+ bool check_dir(const std::tr1::shared_ptr<const ContentsEntry> &) const;
+ bool check_sym(const std::tr1::shared_ptr<const ContentsEntry> &) const;
+ bool check_misc(const std::tr1::shared_ptr<const ContentsEntry> &) const;
public:
///\name Basic operations