aboutsummaryrefslogtreecommitdiff
path: root/paludis/environments/paludis/world.cc
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/environments/paludis/world.cc
parent75f48bbb1ae368febe984c10c2db2d0b5cbd7cec (diff)
downloadpaludis-49750cc61904ba17060521bd345c6ae526fb1bf8.tar.gz
paludis-49750cc61904ba17060521bd345c6ae526fb1bf8.tar.xz
FSEntry -> FSPath, FSStat
Fixes: ticket:967
Diffstat (limited to 'paludis/environments/paludis/world.cc')
-rw-r--r--paludis/environments/paludis/world.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/paludis/environments/paludis/world.cc b/paludis/environments/paludis/world.cc
index 714f185e0..79e865da1 100644
--- a/paludis/environments/paludis/world.cc
+++ b/paludis/environments/paludis/world.cc
@@ -19,12 +19,12 @@
#include <paludis/environments/paludis/world.hh>
#include <paludis/util/pimp-impl.hh>
-#include <paludis/util/fs_entry.hh>
#include <paludis/util/mutex.hh>
#include <paludis/util/stringify.hh>
#include <paludis/util/log.hh>
#include <paludis/util/make_named_values.hh>
#include <paludis/util/safe_ofstream.hh>
+#include <paludis/util/fs_stat.hh>
#include <paludis/set_file.hh>
#include <paludis/user_dep_spec.hh>
#include <paludis/dep_tag.hh>
@@ -40,10 +40,10 @@ namespace paludis
struct Imp<World>
{
const Environment * const env;
- const std::shared_ptr<const FSEntry> maybe_world_file;
+ const std::shared_ptr<const FSPath> maybe_world_file;
mutable Mutex mutex;
- Imp(const Environment * const e, const std::shared_ptr<const FSEntry> & m) :
+ Imp(const Environment * const e, const std::shared_ptr<const FSPath> & m) :
env(e),
maybe_world_file(m)
{
@@ -51,7 +51,7 @@ namespace paludis
};
}
-World::World(const Environment * const e, const std::shared_ptr<const FSEntry> & f) :
+World::World(const Environment * const e, const std::shared_ptr<const FSPath> & f) :
Pimp<World>(e, f)
{
}
@@ -102,7 +102,7 @@ World::_add_string_to_world(const std::string & n) const
Context context("When adding '" + n + "' to world file '" + stringify(*_imp->maybe_world_file) + "':");
- if (! _imp->maybe_world_file->exists())
+ if (! _imp->maybe_world_file->stat().exists())
{
try
{
@@ -147,7 +147,7 @@ World::_remove_string_from_world(const std::string & n) const
Context context("When removing '" + n + "' from world file '" + stringify(*_imp->maybe_world_file) + "':");
- if (_imp->maybe_world_file->exists())
+ if (_imp->maybe_world_file->stat().exists())
{
SetFile world(make_named_values<SetFileParams>(
n::environment() = _imp->env,
@@ -181,7 +181,7 @@ World::world_set() const
if (_imp->maybe_world_file)
{
- if (_imp->maybe_world_file->exists())
+ if (_imp->maybe_world_file->stat().exists())
{
SetFile world(make_named_values<SetFileParams>(
n::environment() = _imp->env,
@@ -201,7 +201,7 @@ World::world_set() const
return std::make_shared<SetSpecTree>(std::make_shared<AllDepSpec>());
}
-std::shared_ptr<const FSEntry>
+std::shared_ptr<const FSPath>
World::location_if_set() const
{
return _imp->maybe_world_file;