aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/virtuals
diff options
context:
space:
mode:
Diffstat (limited to 'paludis/repositories/virtuals')
-rw-r--r--paludis/repositories/virtuals/installed_virtuals_repository.cc25
-rw-r--r--paludis/repositories/virtuals/installed_virtuals_repository.hh6
-rw-r--r--paludis/repositories/virtuals/installed_virtuals_repository_TEST.cc2
-rw-r--r--paludis/repositories/virtuals/package_id.cc4
-rw-r--r--paludis/repositories/virtuals/package_id.hh2
-rw-r--r--paludis/repositories/virtuals/virtuals_repository.cc8
-rw-r--r--paludis/repositories/virtuals/virtuals_repository.hh4
7 files changed, 25 insertions, 26 deletions
diff --git a/paludis/repositories/virtuals/installed_virtuals_repository.cc b/paludis/repositories/virtuals/installed_virtuals_repository.cc
index b5f3c869c..97e7bec60 100644
--- a/paludis/repositories/virtuals/installed_virtuals_repository.cc
+++ b/paludis/repositories/virtuals/installed_virtuals_repository.cc
@@ -25,7 +25,6 @@
#include <paludis/package_database.hh>
#include <paludis/literal_metadata_key.hh>
#include <paludis/action.hh>
-#include <paludis/util/fs_entry.hh>
#include <paludis/util/pimp-impl.hh>
#include <paludis/util/sequence.hh>
#include <paludis/util/set.hh>
@@ -52,21 +51,21 @@ namespace paludis
struct Imp<InstalledVirtualsRepository>
{
const Environment * const env;
- const FSEntry root;
+ const FSPath root;
const std::shared_ptr<Mutex> ids_mutex;
mutable IDMap ids;
mutable bool has_ids;
- std::shared_ptr<const MetadataValueKey<FSEntry> > root_key;
+ std::shared_ptr<const MetadataValueKey<FSPath> > root_key;
std::shared_ptr<const MetadataValueKey<std::string> > format_key;
- Imp(const Environment * const e, const FSEntry & r, std::shared_ptr<Mutex> m = std::make_shared<Mutex>()) :
+ Imp(const Environment * const e, const FSPath & r, std::shared_ptr<Mutex> m = std::make_shared<Mutex>()) :
env(e),
root(r),
ids_mutex(m),
has_ids(false),
- root_key(std::make_shared<LiteralMetadataValueKey<FSEntry> >(
+ root_key(std::make_shared<LiteralMetadataValueKey<FSPath> >(
"root", "root", mkt_normal, root)),
format_key(std::make_shared<LiteralMetadataValueKey<std::string> >(
"format", "format", mkt_significant, "installed_virtuals"))
@@ -94,9 +93,9 @@ namespace
};
RepositoryName
- make_name(const FSEntry & r)
+ make_name(const FSPath & r)
{
- if (FSEntry("/") == r)
+ if (FSPath("/") == r)
return RepositoryName("installed-virtuals");
else
{
@@ -108,7 +107,7 @@ namespace
}
InstalledVirtualsRepository::InstalledVirtualsRepository(const Environment * const env,
- const FSEntry & r) :
+ const FSPath & r) :
Repository(env, RepositoryName(make_name(r)), make_named_values<RepositoryCapabilities>(
n::destination_interface() = static_cast<RepositoryDestinationInterface *>(this),
n::environment_variable_interface() = static_cast<RepositoryEnvironmentVariableInterface *>(0),
@@ -319,13 +318,13 @@ InstalledVirtualsRepository::format_key() const
return _imp->format_key;
}
-const std::shared_ptr<const MetadataValueKey<FSEntry> >
+const std::shared_ptr<const MetadataValueKey<FSPath> >
InstalledVirtualsRepository::location_key() const
{
- return std::shared_ptr<const MetadataValueKey<FSEntry> >();
+ return std::shared_ptr<const MetadataValueKey<FSPath> >();
}
-const std::shared_ptr<const MetadataValueKey<FSEntry> >
+const std::shared_ptr<const MetadataValueKey<FSPath> >
InstalledVirtualsRepository::installed_root_key() const
{
return _imp->root_key;
@@ -341,7 +340,7 @@ InstalledVirtualsRepository::repository_factory_name(
const Environment * const,
const std::function<std::string (const std::string &)> & f)
{
- return make_name(FSEntry(f("root")));
+ return make_name(FSPath(f("root")));
}
std::shared_ptr<Repository>
@@ -352,7 +351,7 @@ InstalledVirtualsRepository::repository_factory_create(
if (f("root").empty())
throw ConfigurationError("Key 'root' unspecified or empty");
- return std::make_shared<InstalledVirtualsRepository>(env, f("root"));
+ return std::make_shared<InstalledVirtualsRepository>(env, FSPath(f("root")));
}
std::shared_ptr<const RepositoryNameSet>
diff --git a/paludis/repositories/virtuals/installed_virtuals_repository.hh b/paludis/repositories/virtuals/installed_virtuals_repository.hh
index 0e162f0f5..83f129484 100644
--- a/paludis/repositories/virtuals/installed_virtuals_repository.hh
+++ b/paludis/repositories/virtuals/installed_virtuals_repository.hh
@@ -51,7 +51,7 @@ namespace paludis
//\{
InstalledVirtualsRepository(const Environment * const env,
- const FSEntry & root);
+ const FSPath & root);
virtual ~InstalledVirtualsRepository();
@@ -115,8 +115,8 @@ namespace paludis
/* Keys */
virtual const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const;
- virtual const std::shared_ptr<const MetadataValueKey<FSEntry> > location_key() const;
- virtual const std::shared_ptr<const MetadataValueKey<FSEntry> > installed_root_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<FSPath> > location_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<FSPath> > installed_root_key() const;
virtual const std::shared_ptr<const MetadataValueKey<std::string> > accept_keywords_key() const;
virtual const std::shared_ptr<const MetadataValueKey<std::string> > sync_host_key() const;
diff --git a/paludis/repositories/virtuals/installed_virtuals_repository_TEST.cc b/paludis/repositories/virtuals/installed_virtuals_repository_TEST.cc
index 136472f4b..d1156cbec 100644
--- a/paludis/repositories/virtuals/installed_virtuals_repository_TEST.cc
+++ b/paludis/repositories/virtuals/installed_virtuals_repository_TEST.cc
@@ -34,7 +34,7 @@ namespace test_cases
void run()
{
TestEnvironment env;
- std::shared_ptr<const InstalledVirtualsRepository> r(std::make_shared<InstalledVirtualsRepository>(&env, FSEntry("/")));
+ std::shared_ptr<const InstalledVirtualsRepository> r(std::make_shared<InstalledVirtualsRepository>(&env, FSPath("/")));
}
} test_installed_virtuals_repository;
}
diff --git a/paludis/repositories/virtuals/package_id.cc b/paludis/repositories/virtuals/package_id.cc
index 0b6900f76..81adbc2a3 100644
--- a/paludis/repositories/virtuals/package_id.cc
+++ b/paludis/repositories/virtuals/package_id.cc
@@ -533,10 +533,10 @@ VirtualsPackageID::contained_in_key() const
return std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > >();
}
-const std::shared_ptr<const MetadataValueKey<FSEntry> >
+const std::shared_ptr<const MetadataValueKey<FSPath> >
VirtualsPackageID::fs_location_key() const
{
- return std::shared_ptr<const MetadataValueKey<FSEntry> >();
+ return std::shared_ptr<const MetadataValueKey<FSPath> >();
}
const std::shared_ptr<const MetadataValueKey<SlotName> >
diff --git a/paludis/repositories/virtuals/package_id.hh b/paludis/repositories/virtuals/package_id.hh
index d7744682a..a5e14651d 100644
--- a/paludis/repositories/virtuals/package_id.hh
+++ b/paludis/repositories/virtuals/package_id.hh
@@ -104,7 +104,7 @@ namespace paludis
virtual const std::shared_ptr<const MetadataTimeKey> installed_time_key() const;
virtual const std::shared_ptr<const MetadataCollectionKey<PackageIDSequence> > contains_key() const;
virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const PackageID> > > contained_in_key() const;
- virtual const std::shared_ptr<const MetadataValueKey<FSEntry> > fs_location_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<FSPath> > fs_location_key() const;
virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > behaviours_key() const;
virtual const std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > from_repositories_key() const;
virtual const std::shared_ptr<const MetadataValueKey<std::shared_ptr<const Choices> > > choices_key() const;
diff --git a/paludis/repositories/virtuals/virtuals_repository.cc b/paludis/repositories/virtuals/virtuals_repository.cc
index 97609658f..b9fddc70c 100644
--- a/paludis/repositories/virtuals/virtuals_repository.cc
+++ b/paludis/repositories/virtuals/virtuals_repository.cc
@@ -419,16 +419,16 @@ VirtualsRepository::format_key() const
return _imp->format_key;
}
-const std::shared_ptr<const MetadataValueKey<FSEntry> >
+const std::shared_ptr<const MetadataValueKey<FSPath> >
VirtualsRepository::location_key() const
{
- return std::shared_ptr<const MetadataValueKey<FSEntry> >();
+ return std::shared_ptr<const MetadataValueKey<FSPath> >();
}
-const std::shared_ptr<const MetadataValueKey<FSEntry> >
+const std::shared_ptr<const MetadataValueKey<FSPath> >
VirtualsRepository::installed_root_key() const
{
- return std::shared_ptr<const MetadataValueKey<FSEntry> >();
+ return std::shared_ptr<const MetadataValueKey<FSPath> >();
}
void
diff --git a/paludis/repositories/virtuals/virtuals_repository.hh b/paludis/repositories/virtuals/virtuals_repository.hh
index e93c78317..bea701b34 100644
--- a/paludis/repositories/virtuals/virtuals_repository.hh
+++ b/paludis/repositories/virtuals/virtuals_repository.hh
@@ -118,8 +118,8 @@ namespace paludis
/* Keys */
virtual const std::shared_ptr<const MetadataValueKey<std::string> > format_key() const;
- virtual const std::shared_ptr<const MetadataValueKey<FSEntry> > location_key() const;
- virtual const std::shared_ptr<const MetadataValueKey<FSEntry> > installed_root_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<FSPath> > location_key() const;
+ virtual const std::shared_ptr<const MetadataValueKey<FSPath> > installed_root_key() const;
virtual const std::shared_ptr<const MetadataValueKey<std::string> > accept_keywords_key() const;
virtual const std::shared_ptr<const MetadataValueKey<std::string> > sync_host_key() const;