aboutsummaryrefslogtreecommitdiff
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
parent12e59def0f6ad2aae3c931079de93f7c3fba1af2 (diff)
downloadpaludis-79e482a013061ab2e9fd4f87eeb3babb4d1ba1e2.tar.gz
paludis-79e482a013061ab2e9fd4f87eeb3babb4d1ba1e2.tar.xz
Kill deprecated keys
-rw-r--r--paludis/environments/paludis/keywords_conf.cc7
-rw-r--r--paludis/environments/paludis/licenses_conf.cc7
-rw-r--r--paludis/environments/paludis/paludis_config.cc40
-rw-r--r--paludis/environments/paludis/use_conf.cc7
-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
9 files changed, 21 insertions, 121 deletions
diff --git a/paludis/environments/paludis/keywords_conf.cc b/paludis/environments/paludis/keywords_conf.cc
index 155360a..15d2f88 100644
--- a/paludis/environments/paludis/keywords_conf.cc
+++ b/paludis/environments/paludis/keywords_conf.cc
@@ -98,13 +98,6 @@ KeywordsConf::add(const FSEntry & filename)
if (tokens.size() < 2)
continue;
- if ("*" == tokens.at(0))
- {
- Log::get_instance()->message("paludis_environment.keywords_conf.deprecated", ll_warning, lc_context)
- << "Use of token '*' is deprecated, use '*/*' instead";
- tokens.at(0) = "*/*";
- }
-
try
{
std::tr1::shared_ptr<PackageDepSpec> d(new PackageDepSpec(parse_user_package_dep_spec(
diff --git a/paludis/environments/paludis/licenses_conf.cc b/paludis/environments/paludis/licenses_conf.cc
index 1cf40b2..fd25e0d 100644
--- a/paludis/environments/paludis/licenses_conf.cc
+++ b/paludis/environments/paludis/licenses_conf.cc
@@ -97,13 +97,6 @@ LicensesConf::add(const FSEntry & filename)
if (tokens.size() < 2)
continue;
- if ("*" == tokens.at(0))
- {
- Log::get_instance()->message("paludis_environment.licenses_conf.deprecated", ll_warning, lc_context)
- << "Use of token '*' is deprecated, use '*/*' instead";
- tokens.at(0) = "*/*";
- }
-
try
{
std::tr1::shared_ptr<PackageDepSpec> d(new PackageDepSpec(parse_user_package_dep_spec(
diff --git a/paludis/environments/paludis/paludis_config.cc b/paludis/environments/paludis/paludis_config.cc
index 1b909cd..97ab114 100644
--- a/paludis/environments/paludis/paludis_config.cc
+++ b/paludis/environments/paludis/paludis_config.cc
@@ -291,24 +291,17 @@ namespace paludis
if (! kv->get("reduced_username").empty())
reduced_username = kv->get("reduced_username");
- if (! kv->get("portage_compatible").empty())
- Log::get_instance()->message("paludis_environment.portage_compatible.deprecated", ll_warning, lc_context)
- << "The 'portage_compatible' variable in environment.conf is deprecated,"
- << " set 'accept_breaks_portage' to empty instead.";
- else
- {
- std::list<std::string> breakages;
- tokenise_whitespace(kv->get("accept_breaks_portage"), std::back_inserter(breakages));
- for (std::list<std::string>::const_iterator it(breakages.begin()),
- it_end(breakages.end()); it_end != it; ++it)
- if ("*" == *it)
- {
- accept_all_breaks_portage = true;
- break;
- }
- else
- accept_breaks_portage.insert(*it);
- }
+ std::list<std::string> breakages;
+ tokenise_whitespace(kv->get("accept_breaks_portage"), std::back_inserter(breakages));
+ for (std::list<std::string>::const_iterator it(breakages.begin()),
+ it_end(breakages.end()); it_end != it; ++it)
+ if ("*" == *it)
+ {
+ accept_all_breaks_portage = true;
+ break;
+ }
+ else
+ accept_breaks_portage.insert(*it);
distribution = kv->get("distribution");
@@ -400,17 +393,6 @@ PaludisConfig::PaludisConfig(PaludisEnvironment * const e, const std::string & s
def_predefined,
&KeyValueConfigFile::no_transformation));
}
- else if ((local_config_dir / "specpath").exists())
- {
- specpath.reset(new KeyValueConfigFile(
- local_config_dir / "specpath",
- KeyValueConfigFileOptions(),
- def_predefined,
- &KeyValueConfigFile::no_transformation));
-
- Log::get_instance()->message("paludis_environment.paludis_config.specpath.deprecated", ll_warning, lc_no_context)
- << "Using specpath is deprecated, use specpath.conf instead";
- }
else if (_imp->commandline_environment->end() != _imp->commandline_environment->find("root"))
{
std::istringstream strm;
diff --git a/paludis/environments/paludis/use_conf.cc b/paludis/environments/paludis/use_conf.cc
index 75e1eac..ad940bc 100644
--- a/paludis/environments/paludis/use_conf.cc
+++ b/paludis/environments/paludis/use_conf.cc
@@ -104,13 +104,6 @@ UseConf::add(const FSEntry & filename)
if (tokens.size() < 2)
continue;
- if ("*" == tokens.at(0))
- {
- Log::get_instance()->message("paludis_environment.use_conf.deprecated", ll_warning, lc_context)
- << "Use of token '*' is deprecated, use '*/*' instead";
- tokens.at(0) = "*/*";
- }
-
try
{
std::tr1::shared_ptr<PackageDepSpec> d(new PackageDepSpec(parse_user_package_dep_spec(
diff --git a/paludis/repositories/cran/cran_repository.cc b/paludis/repositories/cran/cran_repository.cc
index 1b216a7..5f7765c 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 0e90717..06505d1 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 e3a0edd..bee366b 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 a67d80b..b263a83 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 b8c7271..24b397e 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())