aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-12-05 21:29:28 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-12-05 21:29:28 +0000
commit79e482a013061ab2e9fd4f87eeb3babb4d1ba1e2 (patch)
treef06f7eebf28d35a95712a501f70053d1db09755a /paludis/repositories
parent12e59def0f6ad2aae3c931079de93f7c3fba1af2 (diff)
downloadpaludis-79e482a013061ab2e9fd4f87eeb3babb4d1ba1e2.tar.gz
paludis-79e482a013061ab2e9fd4f87eeb3babb4d1ba1e2.tar.xz
Kill deprecated keys
Diffstat (limited to 'paludis/repositories')
-rw-r--r--paludis/repositories/cran/cran_repository.cc9
-rw-r--r--paludis/repositories/e/e_repository.cc26
-rw-r--r--paludis/repositories/e/exndbam_repository.cc11
-rw-r--r--paludis/repositories/e/registration.cc24
-rw-r--r--paludis/repositories/e/vdb_repository.cc11
5 files changed, 10 insertions, 71 deletions
diff --git a/paludis/repositories/cran/cran_repository.cc b/paludis/repositories/cran/cran_repository.cc
index 1b216a7b1..5f7765c6f 100644
--- a/paludis/repositories/cran/cran_repository.cc
+++ b/paludis/repositories/cran/cran_repository.cc
@@ -465,14 +465,7 @@ CRANRepository::repository_factory_create(
std::string builddir(f("builddir"));
if (builddir.empty())
- {
- builddir = f("buildroot");
- if (builddir.empty())
- builddir = "/var/tmp/paludis";
- else
- Log::get_instance()->message("cran.configuration.deprecated", ll_warning, lc_context)
- << "Key 'buildroot' is deprecated, use 'builddir' instead";
- }
+ builddir = "/var/tmp/paludis";
return std::tr1::shared_ptr<Repository>(new CRANRepository(CRANRepositoryParams::create()
.environment(env)
diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc
index 0e90717d6..06505d197 100644
--- a/paludis/repositories/e/e_repository.cc
+++ b/paludis/repositories/e/e_repository.cc
@@ -1499,31 +1499,15 @@ ERepository::repository_factory_create(
std::string sync_options(f("sync_options"));
- if (! f("sync_exclude").empty())
- {
- Log::get_instance()->message("e.ebuild.configuration.deprecated", ll_warning, lc_no_context)
- << "The sync_exclude key in '" << f("repo_file") << "' is deprecated in favour of sync_options = --exclude-from=";
- if (! sync_options.empty())
- sync_options += " ";
- sync_options += "--exclude-from='" + f("sync_exclude") + "'";
- }
-
std::string builddir(f("builddir"));
if (builddir.empty())
{
- builddir = f("buildroot");
- if (builddir.empty())
- {
- if (master_repositories)
- builddir = stringify((*master_repositories->begin())->params().builddir());
- else
- builddir = EExtraDistributionData::get_instance()->data_from_distribution(
- *DistributionData::get_instance()->distribution_from_string(
- env->distribution()))->default_buildroot();
- }
+ if (master_repositories)
+ builddir = stringify((*master_repositories->begin())->params().builddir());
else
- Log::get_instance()->message("e.ebuild.configuration.deprecated", ll_warning, lc_context)
- << "Key 'buildroot' is deprecated, use 'builddir' instead";
+ builddir = EExtraDistributionData::get_instance()->data_from_distribution(
+ *DistributionData::get_instance()->distribution_from_string(
+ env->distribution()))->default_buildroot();
}
std::string layout(f("layout"));
diff --git a/paludis/repositories/e/exndbam_repository.cc b/paludis/repositories/e/exndbam_repository.cc
index e3a0edd38..bee366b7f 100644
--- a/paludis/repositories/e/exndbam_repository.cc
+++ b/paludis/repositories/e/exndbam_repository.cc
@@ -148,15 +148,8 @@ ExndbamRepository::repository_factory_create(
std::string builddir(f("builddir"));
if (builddir.empty())
- {
- builddir = f("buildroot");
- if (builddir.empty())
- builddir = EExtraDistributionData::get_instance()->data_from_distribution(*DistributionData::get_instance()->distribution_from_string(
- env->distribution()))->default_buildroot();
- else
- Log::get_instance()->message("e.exndbam.configuration.deprecated", ll_warning, lc_context)
- << "Key 'buildroot' is deprecated, use 'builddir' instead";
- }
+ builddir = EExtraDistributionData::get_instance()->data_from_distribution(*DistributionData::get_instance()->distribution_from_string(
+ env->distribution()))->default_buildroot();
std::string name(f("name"));
if (name.empty())
diff --git a/paludis/repositories/e/registration.cc b/paludis/repositories/e/registration.cc
index a67d80b33..b263a833b 100644
--- a/paludis/repositories/e/registration.cc
+++ b/paludis/repositories/e/registration.cc
@@ -30,19 +30,6 @@ using namespace paludis;
namespace
{
- std::tr1::shared_ptr<Repository>
- make_portage_repository(
- Environment * const env,
- const std::tr1::function<std::string (const std::string &)> & f)
- {
- Context context("When creating repository using '" + f("repo_file") + "':");
-
- Log::get_instance()->message("e.portage.configuration.deprecated", ll_warning, lc_context)
- << "Format 'portage' is deprecated, use 'ebuild' instead";
-
- return ERepository::repository_factory_create(env, f);
- }
-
int generic_importance(const Environment * const, const std::tr1::function<std::string (const std::string &)> & f)
{
if (! f("importance").empty())
@@ -70,17 +57,6 @@ void paludis_initialise_repository_so(RepositoryFactory * const factory)
&ERepository::repository_factory_dependencies
);
- std::tr1::shared_ptr<Set<std::string> > deprecated_ebuild_formats(new Set<std::string>);
- deprecated_ebuild_formats->insert("portage");
-
- factory->add_repository_format(
- deprecated_ebuild_formats,
- &ERepository::repository_factory_name,
- &generic_importance,
- make_portage_repository,
- &ERepository::repository_factory_dependencies
- );
-
std::tr1::shared_ptr<Set<std::string> > vdb_formats(new Set<std::string>);
vdb_formats->insert("vdb");
diff --git a/paludis/repositories/e/vdb_repository.cc b/paludis/repositories/e/vdb_repository.cc
index b8c727107..24b397ed6 100644
--- a/paludis/repositories/e/vdb_repository.cc
+++ b/paludis/repositories/e/vdb_repository.cc
@@ -323,15 +323,8 @@ VDBRepository::repository_factory_create(
std::string builddir(f("builddir"));
if (builddir.empty())
- {
- builddir = f("buildroot");
- if (builddir.empty())
- builddir = EExtraDistributionData::get_instance()->data_from_distribution(*DistributionData::get_instance()->distribution_from_string(
- env->distribution()))->default_buildroot();
- else
- Log::get_instance()->message("e.vdb.configuration.deprecated", ll_warning, lc_context)
- << "Key 'buildroot' is deprecated, use 'builddir' instead";
- }
+ builddir = EExtraDistributionData::get_instance()->data_from_distribution(*DistributionData::get_instance()->distribution_from_string(
+ env->distribution()))->default_buildroot();
std::string name(f("name"));
if (name.empty())