aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e/metadata_xml.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/repositories/e/metadata_xml.cc
parent75f48bbb1ae368febe984c10c2db2d0b5cbd7cec (diff)
downloadpaludis-49750cc61904ba17060521bd345c6ae526fb1bf8.tar.gz
paludis-49750cc61904ba17060521bd345c6ae526fb1bf8.tar.xz
FSEntry -> FSPath, FSStat
Fixes: ticket:967
Diffstat (limited to 'paludis/repositories/e/metadata_xml.cc')
-rw-r--r--paludis/repositories/e/metadata_xml.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/paludis/repositories/e/metadata_xml.cc b/paludis/repositories/e/metadata_xml.cc
index 44c8ae12f..cd401dd1d 100644
--- a/paludis/repositories/e/metadata_xml.cc
+++ b/paludis/repositories/e/metadata_xml.cc
@@ -23,9 +23,10 @@
#include <paludis/util/singleton-impl.hh>
#include <paludis/util/map-impl.hh>
#include <paludis/util/mutex.hh>
-#include <paludis/util/fs_entry.hh>
#include <paludis/util/hashes.hh>
#include <paludis/util/log.hh>
+#include <paludis/util/fs_path.hh>
+#include <paludis/util/fs_stat.hh>
#include <paludis/literal_metadata_key.hh>
#include <paludis/choice.hh>
#include <unordered_map>
@@ -33,7 +34,7 @@
using namespace paludis;
using namespace paludis::erepository;
-typedef std::unordered_map<FSEntry, std::shared_ptr<MetadataXML>, Hash<FSEntry> > Store;
+typedef std::unordered_map<FSPath, std::shared_ptr<MetadataXML>, Hash<FSPath> > Store;
namespace paludis
{
@@ -55,11 +56,11 @@ MetadataXMLPool::~MetadataXMLPool()
}
const std::shared_ptr<const MetadataXML>
-MetadataXMLPool::metadata_if_exists(const FSEntry & f) const
+MetadataXMLPool::metadata_if_exists(const FSPath & f) const
{
Context context("When handling metadata.xml file '" + stringify(f) + "':");
- FSEntry f_real(f.realpath_if_exists());
+ FSPath f_real(f.realpath_if_exists());
Lock lock(_imp->mutex);
Store::const_iterator i(_imp->store.find(f_real));
if (i != _imp->store.end())
@@ -67,7 +68,7 @@ MetadataXMLPool::metadata_if_exists(const FSEntry & f) const
else
{
std::shared_ptr<MetadataXML> metadata_xml;
- if (f_real.is_regular_file_or_symlink_to_regular_file())
+ if (f_real.stat().is_regular_file_or_symlink_to_regular_file())
{
try
{