aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-12 15:38:23 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-04-12 15:38:23 +0100
commit25e645d50d251cac16cd0d596b461b82779119f7 (patch)
treece7a156d51e6c51a073361ddbc9d8789fae38db4
parent8a4c64f943a22c2da2175f9f86a44fb3107b80e4 (diff)
downloadpaludis-25e645d50d251cac16cd0d596b461b82779119f7.tar.gz
paludis-25e645d50d251cac16cd0d596b461b82779119f7.tar.xz
Kill is_default_destination
-rw-r--r--paludis/repositories/accounts/accounts_repository.cc7
-rw-r--r--paludis/repositories/accounts/accounts_repository.hh2
-rw-r--r--paludis/repositories/e/e_installed_repository.cc6
-rw-r--r--paludis/repositories/e/e_installed_repository.hh3
-rw-r--r--paludis/repositories/e/e_repository.cc6
-rw-r--r--paludis/repositories/e/e_repository.hh3
-rw-r--r--paludis/repositories/fake/fake_installed_repository.cc6
-rw-r--r--paludis/repositories/fake/fake_installed_repository.hh3
-rw-r--r--paludis/repositories/repository/repository_repository.cc6
-rw-r--r--paludis/repositories/repository/repository_repository.hh3
-rw-r--r--paludis/repositories/unpackaged/installed_repository.cc6
-rw-r--r--paludis/repositories/unpackaged/installed_repository.hh3
-rw-r--r--paludis/repositories/virtuals/installed_virtuals_repository.cc6
-rw-r--r--paludis/repositories/virtuals/installed_virtuals_repository.hh3
-rw-r--r--paludis/repository.hh6
15 files changed, 0 insertions, 69 deletions
diff --git a/paludis/repositories/accounts/accounts_repository.cc b/paludis/repositories/accounts/accounts_repository.cc
index 8ca6b7b..e86de37 100644
--- a/paludis/repositories/accounts/accounts_repository.cc
+++ b/paludis/repositories/accounts/accounts_repository.cc
@@ -402,13 +402,6 @@ AccountsRepository::is_suitable_destination_for(const std::shared_ptr<const Pack
}
bool
-AccountsRepository::is_default_destination() const
-{
- return _imp->handler_if_installed &&
- _imp->params_if_installed->environment()->preferred_root_key()->parse_value() == installed_root_key()->parse_value();
-}
-
-bool
AccountsRepository::want_pre_post_phases() const
{
return true;
diff --git a/paludis/repositories/accounts/accounts_repository.hh b/paludis/repositories/accounts/accounts_repository.hh
index 9234ab1..e3cf12c 100644
--- a/paludis/repositories/accounts/accounts_repository.hh
+++ b/paludis/repositories/accounts/accounts_repository.hh
@@ -156,8 +156,6 @@ namespace paludis
virtual bool is_suitable_destination_for(const std::shared_ptr<const PackageID> &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual bool is_default_destination() const
- PALUDIS_ATTRIBUTE((warn_unused_result));
virtual bool want_pre_post_phases() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual void merge(const MergeParams &);
diff --git a/paludis/repositories/e/e_installed_repository.cc b/paludis/repositories/e/e_installed_repository.cc
index e12e1aa..0883ede 100644
--- a/paludis/repositories/e/e_installed_repository.cc
+++ b/paludis/repositories/e/e_installed_repository.cc
@@ -148,12 +148,6 @@ EInstalledRepository::is_suitable_destination_for(const std::shared_ptr<const Pa
}
bool
-EInstalledRepository::is_default_destination() const
-{
- return _imp->params.environment()->preferred_root_key()->parse_value() == installed_root_key()->parse_value();
-}
-
-bool
EInstalledRepository::want_pre_post_phases() const
{
return true;
diff --git a/paludis/repositories/e/e_installed_repository.hh b/paludis/repositories/e/e_installed_repository.hh
index 9aa1825..43363dd 100644
--- a/paludis/repositories/e/e_installed_repository.hh
+++ b/paludis/repositories/e/e_installed_repository.hh
@@ -66,9 +66,6 @@ namespace paludis
virtual bool is_suitable_destination_for(const std::shared_ptr<const PackageID> &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual bool is_default_destination() const
- PALUDIS_ATTRIBUTE((warn_unused_result));
-
virtual bool want_pre_post_phases() const
PALUDIS_ATTRIBUTE((warn_unused_result));
diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc
index 34e5d68..1ce7ca8 100644
--- a/paludis/repositories/e/e_repository.cc
+++ b/paludis/repositories/e/e_repository.cc
@@ -935,12 +935,6 @@ ERepository::is_suitable_destination_for(const std::shared_ptr<const PackageID>
}
bool
-ERepository::is_default_destination() const
-{
- return false;
-}
-
-bool
ERepository::want_pre_post_phases() const
{
return false;
diff --git a/paludis/repositories/e/e_repository.hh b/paludis/repositories/e/e_repository.hh
index 0a78c69..411d52b 100644
--- a/paludis/repositories/e/e_repository.hh
+++ b/paludis/repositories/e/e_repository.hh
@@ -91,9 +91,6 @@ namespace paludis
virtual bool is_suitable_destination_for(const std::shared_ptr<const PackageID> &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual bool is_default_destination() const
- PALUDIS_ATTRIBUTE((warn_unused_result));
-
virtual bool want_pre_post_phases() const
PALUDIS_ATTRIBUTE((warn_unused_result));
diff --git a/paludis/repositories/fake/fake_installed_repository.cc b/paludis/repositories/fake/fake_installed_repository.cc
index 4941924..29bda5d 100644
--- a/paludis/repositories/fake/fake_installed_repository.cc
+++ b/paludis/repositories/fake/fake_installed_repository.cc
@@ -118,12 +118,6 @@ FakeInstalledRepository::provided_packages() const
}
bool
-FakeInstalledRepository::is_default_destination() const
-{
- return environment()->preferred_root_key()->parse_value() == installed_root_key()->parse_value();
-}
-
-bool
FakeInstalledRepository::want_pre_post_phases() const
{
return true;
diff --git a/paludis/repositories/fake/fake_installed_repository.hh b/paludis/repositories/fake/fake_installed_repository.hh
index 9063cb7..27a2bf2 100644
--- a/paludis/repositories/fake/fake_installed_repository.hh
+++ b/paludis/repositories/fake/fake_installed_repository.hh
@@ -62,9 +62,6 @@ namespace paludis
virtual bool is_suitable_destination_for(const std::shared_ptr<const PackageID> &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual bool is_default_destination() const
- PALUDIS_ATTRIBUTE((warn_unused_result));
-
virtual bool want_pre_post_phases() const
PALUDIS_ATTRIBUTE((warn_unused_result));
diff --git a/paludis/repositories/repository/repository_repository.cc b/paludis/repositories/repository/repository_repository.cc
index dfa6c2d..eb25a73 100644
--- a/paludis/repositories/repository/repository_repository.cc
+++ b/paludis/repositories/repository/repository_repository.cc
@@ -341,12 +341,6 @@ RepositoryRepository::is_suitable_destination_for(const std::shared_ptr<const Pa
}
bool
-RepositoryRepository::is_default_destination() const
-{
- return false;
-}
-
-bool
RepositoryRepository::want_pre_post_phases() const
{
return true;
diff --git a/paludis/repositories/repository/repository_repository.hh b/paludis/repositories/repository/repository_repository.hh
index f2bb031..b125d45 100644
--- a/paludis/repositories/repository/repository_repository.hh
+++ b/paludis/repositories/repository/repository_repository.hh
@@ -98,9 +98,6 @@ namespace paludis
virtual bool is_suitable_destination_for(const std::shared_ptr<const PackageID> &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual bool is_default_destination() const
- PALUDIS_ATTRIBUTE((warn_unused_result));
-
virtual bool want_pre_post_phases() const
PALUDIS_ATTRIBUTE((warn_unused_result));
diff --git a/paludis/repositories/unpackaged/installed_repository.cc b/paludis/repositories/unpackaged/installed_repository.cc
index 562144d..08d9e49 100644
--- a/paludis/repositories/unpackaged/installed_repository.cc
+++ b/paludis/repositories/unpackaged/installed_repository.cc
@@ -407,12 +407,6 @@ InstalledUnpackagedRepository::is_suitable_destination_for(const std::shared_ptr
}
bool
-InstalledUnpackagedRepository::is_default_destination() const
-{
- return _imp->params.environment()->preferred_root_key()->parse_value() == installed_root_key()->parse_value();
-}
-
-bool
InstalledUnpackagedRepository::want_pre_post_phases() const
{
return true;
diff --git a/paludis/repositories/unpackaged/installed_repository.hh b/paludis/repositories/unpackaged/installed_repository.hh
index ba025db..acb21a3 100644
--- a/paludis/repositories/unpackaged/installed_repository.hh
+++ b/paludis/repositories/unpackaged/installed_repository.hh
@@ -68,9 +68,6 @@ namespace paludis
virtual bool is_suitable_destination_for(const std::shared_ptr<const PackageID> &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual bool is_default_destination() const
- PALUDIS_ATTRIBUTE((warn_unused_result));
-
virtual bool want_pre_post_phases() const
PALUDIS_ATTRIBUTE((warn_unused_result));
diff --git a/paludis/repositories/virtuals/installed_virtuals_repository.cc b/paludis/repositories/virtuals/installed_virtuals_repository.cc
index 8aeb581..24f6955 100644
--- a/paludis/repositories/virtuals/installed_virtuals_repository.cc
+++ b/paludis/repositories/virtuals/installed_virtuals_repository.cc
@@ -361,12 +361,6 @@ InstalledVirtualsRepository::is_suitable_destination_for(const std::shared_ptr<c
}
bool
-InstalledVirtualsRepository::is_default_destination() const
-{
- return false;
-}
-
-bool
InstalledVirtualsRepository::want_pre_post_phases() const
{
return false;
diff --git a/paludis/repositories/virtuals/installed_virtuals_repository.hh b/paludis/repositories/virtuals/installed_virtuals_repository.hh
index 6dc9e23..00b999b 100644
--- a/paludis/repositories/virtuals/installed_virtuals_repository.hh
+++ b/paludis/repositories/virtuals/installed_virtuals_repository.hh
@@ -121,9 +121,6 @@ namespace paludis
virtual bool is_suitable_destination_for(const std::shared_ptr<const PackageID> &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual bool is_default_destination() const
- PALUDIS_ATTRIBUTE((warn_unused_result));
-
virtual bool want_pre_post_phases() const
PALUDIS_ATTRIBUTE((warn_unused_result));
diff --git a/paludis/repository.hh b/paludis/repository.hh
index c85f88f..8f173db 100644
--- a/paludis/repository.hh
+++ b/paludis/repository.hh
@@ -610,12 +610,6 @@ namespace paludis
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
/**
- * Are we to be included in the Environment::default_destinations list?
- */
- virtual bool is_default_destination() const
- PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
-
- /**
* If true, pre and post install phases will be used when writing to this
* destination.
*