aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-12-05 21:06:20 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-12-05 21:06:20 +0000
commit41cf92aa39958d70cb305a2b7ffb62a3eaacfe3d (patch)
treed55d18568b55eb3df4467450f052e97bc1201620
parent4ad9c319fd1c6d7fc9b5f8b8adfb63bfa2ecc631 (diff)
downloadpaludis-41cf92aa39958d70cb305a2b7ffb62a3eaacfe3d.tar.gz
paludis-41cf92aa39958d70cb305a2b7ffb62a3eaacfe3d.tar.xz
Kill deprecated
-rw-r--r--paludis/repositories/e/e_installed_repository.cc22
-rw-r--r--paludis/repositories/e/e_installed_repository.hh2
-rw-r--r--paludis/repositories/e/exndbam_repository.cc11
-rw-r--r--paludis/repositories/e/exndbam_repository.hh2
-rw-r--r--paludis/repositories/e/vdb_repository.cc11
-rw-r--r--paludis/repositories/e/vdb_repository.hh2
6 files changed, 0 insertions, 50 deletions
diff --git a/paludis/repositories/e/e_installed_repository.cc b/paludis/repositories/e/e_installed_repository.cc
index 4763b90..bfbe4e1 100644
--- a/paludis/repositories/e/e_installed_repository.cc
+++ b/paludis/repositories/e/e_installed_repository.cc
@@ -191,26 +191,6 @@ EInstalledRepository::package_set(const SetName & s) const
return result;
}
- else if ("world" == s.data())
- {
- if (_imp->params.deprecated_world().exists())
- {
- std::tr1::shared_ptr<GeneralSetDepTag> tag(new GeneralSetDepTag(SetName("world"), stringify(name())));
-
- SetFile world(SetFileParams::create()
- .file_name(_imp->params.deprecated_world())
- .type(sft_simple)
- .parser(std::tr1::bind(&parse_user_package_dep_spec, _1,
- _imp->params.environment(), UserPackageDepSpecOptions() + updso_no_disambiguation + updso_throw_if_set, filter::All()))
- .tag(tag)
- .set_operator_mode(sfsmo_natural)
- .environment(_imp->params.environment()));
- return world.contents();
- }
-
- return std::tr1::shared_ptr<SetSpecTree::ConstItem>(new ConstTreeSequence<SetSpecTree, AllDepSpec>(
- std::tr1::shared_ptr<AllDepSpec>(new AllDepSpec)));
- }
else
return std::tr1::shared_ptr<SetSpecTree::ConstItem>();
}
@@ -222,8 +202,6 @@ EInstalledRepository::sets_list() const
std::tr1::shared_ptr<SetNameSet> result(new SetNameSet);
result->insert(SetName("everything"));
- if (_imp->params.deprecated_world().exists())
- result->insert(SetName("world"));
return result;
}
diff --git a/paludis/repositories/e/e_installed_repository.hh b/paludis/repositories/e/e_installed_repository.hh
index c922dce..13bf67b 100644
--- a/paludis/repositories/e/e_installed_repository.hh
+++ b/paludis/repositories/e/e_installed_repository.hh
@@ -28,7 +28,6 @@ namespace paludis
namespace n
{
struct builddir;
- struct deprecated_world;
struct environment;
struct root;
}
@@ -38,7 +37,6 @@ namespace paludis
struct EInstalledRepositoryParams
{
NamedValue<n::builddir, FSEntry> builddir;
- NamedValue<n::deprecated_world, FSEntry> deprecated_world;
NamedValue<n::environment, Environment *> environment;
NamedValue<n::root, FSEntry> root;
};
diff --git a/paludis/repositories/e/exndbam_repository.cc b/paludis/repositories/e/exndbam_repository.cc
index 1a2c0e2..e3a0edd 100644
--- a/paludis/repositories/e/exndbam_repository.cc
+++ b/paludis/repositories/e/exndbam_repository.cc
@@ -93,7 +93,6 @@ ExndbamRepository::ExndbamRepository(const RepositoryName & n, const ExndbamRepo
EInstalledRepository(
make_named_values<EInstalledRepositoryParams>(
value_for<n::builddir>(p.builddir()),
- value_for<n::deprecated_world>(p.deprecated_world()),
value_for<n::environment>(p.environment()),
value_for<n::root>(p.root())
),
@@ -163,20 +162,10 @@ ExndbamRepository::repository_factory_create(
if (name.empty())
name = "installed";
- std::string deprecated_world(f("world"));
- if (deprecated_world.empty())
- deprecated_world = "/DOESNOTEXIST";
- else
- Log::get_instance()->message("e.exndbam.configuration.deprecated", ll_warning, lc_context) << "Specifying world location " <<
- "in repository configuration files is deprecated. File '" << deprecated_world << "' will be "
- "read but not updated. If you have recently upgraded from <paludis-0.26.0_alpha13, consult "
- "the FAQ Upgrades section.";
-
return std::tr1::shared_ptr<Repository>(new ExndbamRepository(
RepositoryName(name),
make_named_values<ExndbamRepositoryParams>(
value_for<n::builddir>(builddir),
- value_for<n::deprecated_world>(deprecated_world),
value_for<n::environment>(env),
value_for<n::location>(location),
value_for<n::root>(root)
diff --git a/paludis/repositories/e/exndbam_repository.hh b/paludis/repositories/e/exndbam_repository.hh
index ffbddad..6ea44a4 100644
--- a/paludis/repositories/e/exndbam_repository.hh
+++ b/paludis/repositories/e/exndbam_repository.hh
@@ -32,7 +32,6 @@ namespace paludis
namespace n
{
struct builddir;
- struct deprecated_world;
struct environment;
struct location;
struct root;
@@ -45,7 +44,6 @@ namespace paludis
struct ExndbamRepositoryParams
{
NamedValue<n::builddir, FSEntry> builddir;
- NamedValue<n::deprecated_world, FSEntry> deprecated_world;
NamedValue<n::environment, Environment *> environment;
NamedValue<n::location, FSEntry> location;
NamedValue<n::root, FSEntry> root;
diff --git a/paludis/repositories/e/vdb_repository.cc b/paludis/repositories/e/vdb_repository.cc
index dae4f31..b8c7271 100644
--- a/paludis/repositories/e/vdb_repository.cc
+++ b/paludis/repositories/e/vdb_repository.cc
@@ -151,7 +151,6 @@ VDBRepository::VDBRepository(const VDBRepositoryParams & p) :
EInstalledRepository(
make_named_values<EInstalledRepositoryParams>(
value_for<n::builddir>(p.builddir()),
- value_for<n::deprecated_world>(p.deprecated_world()),
value_for<n::environment>(p.environment()),
value_for<n::root>(p.root())
),
@@ -294,15 +293,6 @@ VDBRepository::repository_factory_create(
if (root.empty())
root = "/";
- std::string deprecated_world(f("world"));
- if (deprecated_world.empty())
- deprecated_world = "/DOESNOTEXIST";
- else
- Log::get_instance()->message("e.vdb.configuration.deprecated", ll_warning, lc_context) << "Specifying world location " <<
- "in repository configuration files is deprecated. File '" << deprecated_world << "' will be "
- "read but not updated. If you have recently upgraded from <paludis-0.26.0_alpha13, consult "
- "the FAQ Upgrades section.";
-
std::string provides_cache(f("provides_cache"));
if (provides_cache.empty())
{
@@ -349,7 +339,6 @@ VDBRepository::repository_factory_create(
return std::tr1::shared_ptr<Repository>(new VDBRepository(make_named_values<VDBRepositoryParams>(
value_for<n::builddir>(builddir),
- value_for<n::deprecated_world>(deprecated_world),
value_for<n::environment>(env),
value_for<n::location>(location),
value_for<n::name>(RepositoryName(name)),
diff --git a/paludis/repositories/e/vdb_repository.hh b/paludis/repositories/e/vdb_repository.hh
index 8eb6a38..20a1d10 100644
--- a/paludis/repositories/e/vdb_repository.hh
+++ b/paludis/repositories/e/vdb_repository.hh
@@ -41,7 +41,6 @@ namespace paludis
namespace n
{
struct builddir;
- struct deprecated_world;
struct environment;
struct location;
struct name;
@@ -55,7 +54,6 @@ namespace paludis
struct VDBRepositoryParams
{
NamedValue<n::builddir, FSEntry> builddir;
- NamedValue<n::deprecated_world, FSEntry> deprecated_world;
NamedValue<n::environment, Environment *> environment;
NamedValue<n::location, FSEntry> location;
NamedValue<n::name, RepositoryName> name;