aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-09-11 17:56:54 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-09-11 17:56:54 +0000
commit3c78f63f74004d0338e4ab09f13045ee706670c8 (patch)
treee90efd7000b2d263f82a23e153b76c4da3ee54c7
parentd3761ac826ef3410977d02a37a755b4a5b1229c0 (diff)
downloadpaludis-3c78f63f74004d0338e4ab09f13045ee706670c8.tar.gz
paludis-3c78f63f74004d0338e4ab09f13045ee706670c8.tar.xz
Be consistent with installed repository names. Fixes: ticket:274
-rw-r--r--paludis/dep_list/dep_list_TEST_blockers.cc2
-rw-r--r--paludis/repositories/cran/cran_installed_repository.cc2
-rw-r--r--paludis/repositories/fake/fake_installed_repository.cc2
-rw-r--r--paludis/repositories/virtuals/installed_virtuals_repository.cc4
4 files changed, 5 insertions, 5 deletions
diff --git a/paludis/dep_list/dep_list_TEST_blockers.cc b/paludis/dep_list/dep_list_TEST_blockers.cc
index d286b7a..ceb94af 100644
--- a/paludis/dep_list/dep_list_TEST_blockers.cc
+++ b/paludis/dep_list/dep_list_TEST_blockers.cc
@@ -129,7 +129,7 @@ namespace test_cases
d.add(PackageDepSpec(merge_target, pds_pm_permissive), env.default_destinations());
TEST_CHECK_EQUAL(std::distance(d.begin(), d.end()), 4);
TEST_CHECK_EQUAL(d.begin()->kind, dlk_block);
- TEST_CHECK_STRINGIFY_EQUAL(*d.begin()->package_id, "virtual/two-1::installed_virtuals (virtual for other/two-1:0::installed)");
+ TEST_CHECK_STRINGIFY_EQUAL(*d.begin()->package_id, "virtual/two-1::installed-virtuals (virtual for other/two-1:0::installed)");
TEST_CHECK_EQUAL(next(d.begin())->kind, dlk_package);
TEST_CHECK_STRINGIFY_EQUAL(*next(d.begin())->package_id, "cat/two-1:0::repo");
TEST_CHECK_EQUAL(next(next(d.begin()))->kind, dlk_provided);
diff --git a/paludis/repositories/cran/cran_installed_repository.cc b/paludis/repositories/cran/cran_installed_repository.cc
index 031ae38..917c173 100644
--- a/paludis/repositories/cran/cran_installed_repository.cc
+++ b/paludis/repositories/cran/cran_installed_repository.cc
@@ -151,7 +151,7 @@ Implementation<CRANInstalledRepository>::need_ids() const
#endif
CRANInstalledRepository::CRANInstalledRepository(const CRANInstalledRepositoryParams & p) :
- Repository(RepositoryName("cran_installed"),
+ Repository(RepositoryName("installed-cran"),
RepositoryCapabilities::create()
.installed_interface(this)
.sets_interface(this)
diff --git a/paludis/repositories/fake/fake_installed_repository.cc b/paludis/repositories/fake/fake_installed_repository.cc
index 1147d90..ef39e40 100644
--- a/paludis/repositories/fake/fake_installed_repository.cc
+++ b/paludis/repositories/fake/fake_installed_repository.cc
@@ -53,7 +53,7 @@ FakeInstalledRepository::FakeInstalledRepository(const Environment * const e, co
.qa_interface(0)
.hook_interface(0)
.manifest_interface(0),
- "fake_installed")
+ "fake-installed")
{
}
diff --git a/paludis/repositories/virtuals/installed_virtuals_repository.cc b/paludis/repositories/virtuals/installed_virtuals_repository.cc
index 47a2515..19537f9 100644
--- a/paludis/repositories/virtuals/installed_virtuals_repository.cc
+++ b/paludis/repositories/virtuals/installed_virtuals_repository.cc
@@ -90,10 +90,10 @@ namespace
make_name(const FSEntry & r)
{
if (FSEntry("/") == r)
- return RepositoryName("installed_virtuals");
+ return RepositoryName("installed-virtuals");
else
{
- std::string n("installed_virtuals-" + stringify(r)), result;
+ std::string n("installed-virtuals-" + stringify(r)), result;
std::transform(n.begin(), n.end(), std::back_inserter(result), MakeSafe());
return RepositoryName(result);
}