aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2008-06-11 19:22:00 +0000
committerAvatar Fernando J. Pereda <ferdy@ferdyx.org> 2008-06-14 12:37:54 +0000
commitd7aa5b62d3fd45664426bf99c1e8f2523de919c3 (patch)
tree98be45e904c4934428dfe376de1c727c0a4a77ae
parent8ccc8b972f8c90485876adc4b5fd84d0eece3d16 (diff)
downloadpaludis-d7aa5b62d3fd45664426bf99c1e8f2523de919c3.tar.gz
paludis-d7aa5b62d3fd45664426bf99c1e8f2523de919c3.tar.xz
Environment::default_distribution -> Environment::distribution
-rw-r--r--paludis/dep_list.cc2
-rw-r--r--paludis/distribution.hh2
-rw-r--r--paludis/environment.hh2
-rw-r--r--paludis/environment_implementation.cc4
-rw-r--r--paludis/environment_implementation.hh2
-rw-r--r--paludis/environments/adapted/adapted_environment.cc4
-rw-r--r--paludis/environments/adapted/adapted_environment.hh2
-rw-r--r--paludis/environments/no_config/no_config_environment.cc4
-rw-r--r--paludis/environments/paludis/paludis_environment.cc2
-rw-r--r--paludis/environments/paludis/paludis_environment.hh2
-rw-r--r--paludis/repositories/e/e_installed_repository_id.cc4
-rw-r--r--paludis/repositories/e/e_repository.cc6
-rw-r--r--paludis/repositories/e/e_repository_profile.cc4
-rw-r--r--paludis/repositories/e/exndbam_repository.cc2
-rw-r--r--paludis/repositories/e/make_ebuild_repository.cc16
-rw-r--r--paludis/repositories/e/vdb_repository.cc6
-rw-r--r--paludis/repositories/fake/fake_repository.cc4
-rw-r--r--paludis/repositories/gems/registration.cc4
-rw-r--r--python/additional_tests.cc2
-rw-r--r--python/environment.cc14
-rwxr-xr-xpython/environment_TEST.py4
21 files changed, 46 insertions, 46 deletions
diff --git a/paludis/dep_list.cc b/paludis/dep_list.cc
index a363300..6cc9239 100644
--- a/paludis/dep_list.cc
+++ b/paludis/dep_list.cc
@@ -1095,7 +1095,7 @@ DepList::add_package(const std::tr1::shared_ptr<const PackageID> & p, std::tr1::
p->provide_key()->value()->accept(f);
if (f.begin() != f.end() && ! (*DistributionData::get_instance()->distribution_from_string(
- _imp->env->default_distribution()))[k::support_old_style_virtuals()])
+ _imp->env->distribution()))[k::support_old_style_virtuals()])
throw DistributionConfigurationError("Package '" + stringify(*p) + "' has PROVIDEs, but this distribution "
"does not support old style virtuals");
diff --git a/paludis/distribution.hh b/paludis/distribution.hh
index 9ad5ea7..276903e 100644
--- a/paludis/distribution.hh
+++ b/paludis/distribution.hh
@@ -67,7 +67,7 @@ namespace paludis
* make things easier for other distributions. Instead, DistributionData
* is used to fetch a Distribution class instance. The
* distribution_from_string method is almost always called with the return
- * value of Environment::default_distribution as its parameter.
+ * value of Environment::distribution as its parameter.
*
* \ingroup g_distribution
* \since 0.26
diff --git a/paludis/environment.hh b/paludis/environment.hh
index b2104ae..1e995b2 100644
--- a/paludis/environment.hh
+++ b/paludis/environment.hh
@@ -296,7 +296,7 @@ namespace paludis
///\name Distribution information
///\{
- virtual std::string default_distribution() const
+ virtual std::string distribution() const
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
///\}
diff --git a/paludis/environment_implementation.cc b/paludis/environment_implementation.cc
index 7215216..a0e77a8 100644
--- a/paludis/environment_implementation.cc
+++ b/paludis/environment_implementation.cc
@@ -171,7 +171,7 @@ EnvironmentImplementation::query_use(const UseFlagName & f, const PackageID & e)
}
std::string
-EnvironmentImplementation::default_distribution() const
+EnvironmentImplementation::distribution() const
{
static const std::string result(getenv_with_default("PALUDIS_DISTRIBUTION", DEFAULT_DISTRIBUTION));
return result;
@@ -186,7 +186,7 @@ EnvironmentImplementation::set_names() const
bool
EnvironmentImplementation::is_paludis_package(const QualifiedPackageName & n) const
{
- return stringify(n) == (*DistributionData::get_instance()->distribution_from_string(default_distribution()))[k::paludis_package()];
+ return stringify(n) == (*DistributionData::get_instance()->distribution_from_string(distribution()))[k::paludis_package()];
}
std::tr1::shared_ptr<PackageIDSequence>
diff --git a/paludis/environment_implementation.hh b/paludis/environment_implementation.hh
index aa0ede7..d13d447 100644
--- a/paludis/environment_implementation.hh
+++ b/paludis/environment_implementation.hh
@@ -85,7 +85,7 @@ namespace paludis
virtual std::tr1::shared_ptr<const DestinationsSet> default_destinations() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::string default_distribution() const
+ virtual std::string distribution() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual bool is_paludis_package(const QualifiedPackageName &) const
diff --git a/paludis/environments/adapted/adapted_environment.cc b/paludis/environments/adapted/adapted_environment.cc
index 2ec858e..14e4048 100644
--- a/paludis/environments/adapted/adapted_environment.cc
+++ b/paludis/environments/adapted/adapted_environment.cc
@@ -210,9 +210,9 @@ AdaptedEnvironment::perform_hook(const Hook & h) const
}
std::string
-AdaptedEnvironment::default_distribution() const
+AdaptedEnvironment::distribution() const
{
- return _imp->env->default_distribution();
+ return _imp->env->distribution();
}
const std::tr1::shared_ptr<const Mask>
diff --git a/paludis/environments/adapted/adapted_environment.hh b/paludis/environments/adapted/adapted_environment.hh
index 3ce233b..0e0c7ac 100644
--- a/paludis/environments/adapted/adapted_environment.hh
+++ b/paludis/environments/adapted/adapted_environment.hh
@@ -117,7 +117,7 @@ namespace paludis
virtual HookResult perform_hook(const Hook &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::string default_distribution() const
+ virtual std::string distribution() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual const std::tr1::shared_ptr<const Mask> mask_for_breakage(const PackageID &) const
diff --git a/paludis/environments/no_config/no_config_environment.cc b/paludis/environments/no_config/no_config_environment.cc
index 03cb296..0b39dfb 100644
--- a/paludis/environments/no_config/no_config_environment.cc
+++ b/paludis/environments/no_config/no_config_environment.cc
@@ -199,7 +199,7 @@ Implementation<NoConfigEnvironment>::initialise(NoConfigEnvironment * const env)
package_database->add_repository(2, ((main_repo =
RepositoryMaker::get_instance()->find_maker("ebuild")(env, keys))));
- if ((*DistributionData::get_instance()->distribution_from_string(env->default_distribution()))[k::support_old_style_virtuals()])
+ if ((*DistributionData::get_instance()->distribution_from_string(env->distribution()))[k::support_old_style_virtuals()])
package_database->add_repository(-2, RepositoryMaker::get_instance()->find_maker("virtuals")(env,
std::tr1::shared_ptr<Map<std::string, std::string> >()));
}
@@ -222,7 +222,7 @@ Implementation<NoConfigEnvironment>::initialise(NoConfigEnvironment * const env)
new Map<std::string, std::string>);
iv_keys->insert("root", "/");
- if ((*DistributionData::get_instance()->distribution_from_string(env->default_distribution()))[k::support_old_style_virtuals()])
+ if ((*DistributionData::get_instance()->distribution_from_string(env->distribution()))[k::support_old_style_virtuals()])
package_database->add_repository(-2, RepositoryMaker::get_instance()->find_maker("installed_virtuals")(env,
iv_keys));
}
diff --git a/paludis/environments/paludis/paludis_environment.cc b/paludis/environments/paludis/paludis_environment.cc
index 791c171..b1814a6 100644
--- a/paludis/environments/paludis/paludis_environment.cc
+++ b/paludis/environments/paludis/paludis_environment.cc
@@ -487,7 +487,7 @@ PaludisEnvironment::package_database() const
}
std::string
-PaludisEnvironment::default_distribution() const
+PaludisEnvironment::distribution() const
{
return _imp->config->distribution();
}
diff --git a/paludis/environments/paludis/paludis_environment.hh b/paludis/environments/paludis/paludis_environment.hh
index 7b0af4a..7a782bf 100644
--- a/paludis/environments/paludis/paludis_environment.hh
+++ b/paludis/environments/paludis/paludis_environment.hh
@@ -122,7 +122,7 @@ namespace paludis
virtual std::tr1::shared_ptr<const PackageDatabase> package_database() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual std::string default_distribution() const
+ virtual std::string distribution() const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual bool accept_keywords(std::tr1::shared_ptr<const KeywordNameSet>, const PackageID &) const
diff --git a/paludis/repositories/e/e_installed_repository_id.cc b/paludis/repositories/e/e_installed_repository_id.cc
index 5fd8aac..3346857 100644
--- a/paludis/repositories/e/e_installed_repository_id.cc
+++ b/paludis/repositories/e/e_installed_repository_id.cc
@@ -468,10 +468,10 @@ EInstalledRepositoryID::eapi() const
else
{
Log::get_instance()->message("e.no_eapi", ll_debug, lc_context) << "No EAPI entry in '" << _imp->dir << "', pretending '"
- << _imp->environment->default_distribution() << "'";
+ << _imp->environment->distribution() << "'";
_imp->eapi = EAPIData::get_instance()->eapi_from_string(
(*DistributionData::get_instance()->distribution_from_string(
- _imp->environment->default_distribution()))[k::default_ebuild_eapi_when_unspecified()]);
+ _imp->environment->distribution()))[k::default_ebuild_eapi_when_unspecified()]);
}
return _imp->eapi;
diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc
index 57f09cd..e6cc002 100644
--- a/paludis/repositories/e/e_repository.cc
+++ b/paludis/repositories/e/e_repository.cc
@@ -476,7 +476,7 @@ ERepository::ERepository(const ERepositoryParams & p) :
(k::environment_variable_interface(), this)
(k::mirrors_interface(), this)
(k::virtuals_interface(), (*DistributionData::get_instance()->distribution_from_string(
- p.environment->default_distribution()))[k::support_old_style_virtuals()] ? this : 0)
+ p.environment->distribution()))[k::support_old_style_virtuals()] ? this : 0)
(k::provides_interface(), static_cast<RepositoryProvidesInterface *>(0))
(k::destination_interface(), p.binary_destination ? this : 0)
(k::make_virtuals_interface(), static_cast<RepositoryMakeVirtualsInterface *>(0))
@@ -892,7 +892,7 @@ ERepository::invalidate_masks()
{
_imp->layout->invalidate_masks();
- if ((*DistributionData::get_instance()->distribution_from_string(_imp->params.environment->default_distribution()))
+ if ((*DistributionData::get_instance()->distribution_from_string(_imp->params.environment->distribution()))
[k::support_old_style_virtuals()])
if (_imp->params.environment->package_database()->has_repository_named(RepositoryName("virtuals")))
_imp->params.environment->package_database()->fetch_repository(
@@ -1105,7 +1105,7 @@ ERepository::set_profile(const ProfilesConstIterator & iter)
<< "Using profile '" << ((*iter)[k::path()]) << "'";
_imp->profile_ptr = (*iter)[k::profile()];
- if ((*DistributionData::get_instance()->distribution_from_string(_imp->params.environment->default_distribution()))
+ if ((*DistributionData::get_instance()->distribution_from_string(_imp->params.environment->distribution()))
[k::support_old_style_virtuals()])
if (_imp->params.environment->package_database()->has_repository_named(RepositoryName("virtuals")))
_imp->params.environment->package_database()->fetch_repository(
diff --git a/paludis/repositories/e/e_repository_profile.cc b/paludis/repositories/e/e_repository_profile.cc
index 826e471..7aec5ea 100644
--- a/paludis/repositories/e/e_repository_profile.cc
+++ b/paludis/repositories/e/e_repository_profile.cc
@@ -246,7 +246,7 @@ Implementation<ERepositoryProfile>::load_profile_directory_recursively(const FSE
load_spec_use_file(dir / "package.use.force", stacked_values_list.back().package_use_force);
packages_file.add_file(dir / "packages");
- if ((*DistributionData::get_instance()->distribution_from_string(env->default_distribution()))[k::support_old_style_virtuals()])
+ if ((*DistributionData::get_instance()->distribution_from_string(env->distribution()))[k::support_old_style_virtuals()])
virtuals_file.add_file(dir / "virtuals");
package_mask_file.add_file(dir / "package.mask");
}
@@ -488,7 +488,7 @@ Implementation<ERepositoryProfile>::make_vars_from_file_vars()
}
if ((*DistributionData::get_instance()->distribution_from_string(
- env->default_distribution()))[k::support_old_style_virtuals()])
+ env->distribution()))[k::support_old_style_virtuals()])
try
{
for (erepository::ProfileFile<LineConfigFile>::ConstIterator line(virtuals_file.begin()), line_end(virtuals_file.end()) ;
diff --git a/paludis/repositories/e/exndbam_repository.cc b/paludis/repositories/e/exndbam_repository.cc
index 94e3b22..d129ade 100644
--- a/paludis/repositories/e/exndbam_repository.cc
+++ b/paludis/repositories/e/exndbam_repository.cc
@@ -150,7 +150,7 @@ ExndbamRepository::make_exndbam_repository(
{
if (m->end() == m->find("buildroot") || ((builddir = m->find("buildroot")->second)).empty())
builddir = (*DistributionData::get_instance()->distribution_from_string(
- env->default_distribution()))[k::default_ebuild_builddir()];
+ env->distribution()))[k::default_ebuild_builddir()];
else
Log::get_instance()->message("e.exndbam.configuration.deprecated", ll_warning, lc_context)
<< "Key 'buildroot' is deprecated, use 'builddir' instead";
diff --git a/paludis/repositories/e/make_ebuild_repository.cc b/paludis/repositories/e/make_ebuild_repository.cc
index 345845f..fae4aa5 100644
--- a/paludis/repositories/e/make_ebuild_repository.cc
+++ b/paludis/repositories/e/make_ebuild_repository.cc
@@ -119,7 +119,7 @@ paludis::make_ebuild_repository(
else
{
distdir = (*DistributionData::get_instance()->distribution_from_string(
- env->default_distribution()))[k::default_ebuild_distdir()];
+ env->distribution()))[k::default_ebuild_distdir()];
if (distdir.empty())
distdir = location + "/distfiles";
else if ('/' != distdir.at(0))
@@ -150,7 +150,7 @@ paludis::make_ebuild_repository(
std::string write_cache;
if (m->end() == m->find("write_cache") || ((write_cache = m->find("write_cache")->second)).empty())
write_cache = (*DistributionData::get_instance()->distribution_from_string(
- env->default_distribution()))[k::default_ebuild_write_cache()];
+ env->distribution()))[k::default_ebuild_write_cache()];
bool append_repository_name_to_write_cache(true);
if (m->end() != m->find("append_repository_name_to_write_cache") && ! m->find("append_repository_name_to_write_cache")->second.empty())
@@ -172,7 +172,7 @@ paludis::make_ebuild_repository(
if (! layout_conf
|| (eapi_when_unknown = layout_conf->get("eapi_when_unknown")).empty())
eapi_when_unknown = (*DistributionData::get_instance()->distribution_from_string(
- env->default_distribution()))[k::default_ebuild_eapi_when_unknown()];
+ env->distribution()))[k::default_ebuild_eapi_when_unknown()];
}
std::string eapi_when_unspecified;
@@ -181,7 +181,7 @@ paludis::make_ebuild_repository(
if (! layout_conf
|| (eapi_when_unspecified = layout_conf->get("eapi_when_unspecified")).empty())
eapi_when_unspecified = (*DistributionData::get_instance()->distribution_from_string(
- env->default_distribution()))[k::default_ebuild_eapi_when_unspecified()];
+ env->distribution()))[k::default_ebuild_eapi_when_unspecified()];
}
std::string profile_eapi;
@@ -190,14 +190,14 @@ paludis::make_ebuild_repository(
if (! layout_conf
|| (profile_eapi = layout_conf->get("eapi_when_unspecified")).empty())
profile_eapi = (*DistributionData::get_instance()->distribution_from_string(
- env->default_distribution()))[k::default_ebuild_profile_eapi()];
+ env->distribution()))[k::default_ebuild_profile_eapi()];
}
std::string names_cache;
if (m->end() == m->find("names_cache") || ((names_cache = m->find("names_cache")->second)).empty())
{
names_cache = (*DistributionData::get_instance()->distribution_from_string(
- env->default_distribution()))[k::default_ebuild_names_cache()];
+ env->distribution()))[k::default_ebuild_names_cache()];
if (names_cache.empty())
{
Log::get_instance()->message("e.ebuild.configuration.no_names_cache", ll_warning, lc_no_context)
@@ -229,7 +229,7 @@ paludis::make_ebuild_repository(
{
if (m->end() == m->find("buildroot") || ((builddir = m->find("buildroot")->second)).empty())
builddir = (*DistributionData::get_instance()->distribution_from_string(
- env->default_distribution()))[k::default_ebuild_builddir()];
+ env->distribution()))[k::default_ebuild_builddir()];
else
Log::get_instance()->message("e.ebuild.configuration.deprecated", ll_warning, lc_context)
<< "Key 'buildroot' is deprecated, use 'builddir' instead";
@@ -241,7 +241,7 @@ paludis::make_ebuild_repository(
if (! layout_conf
|| (layout = layout_conf->get("layout")).empty())
layout = (*DistributionData::get_instance()->distribution_from_string(
- env->default_distribution()))[k::default_ebuild_layout()];
+ env->distribution()))[k::default_ebuild_layout()];
}
erepository::UseManifest use_manifest(erepository::manifest_use);
diff --git a/paludis/repositories/e/vdb_repository.cc b/paludis/repositories/e/vdb_repository.cc
index 378e5f5..e4c006e 100644
--- a/paludis/repositories/e/vdb_repository.cc
+++ b/paludis/repositories/e/vdb_repository.cc
@@ -305,7 +305,7 @@ VDBRepository::make_vdb_repository(
if (m->end() == m->find("provides_cache") || ((provides_cache = m->find("provides_cache")->second)).empty())
{
provides_cache = (*DistributionData::get_instance()->distribution_from_string(
- env->default_distribution()))[k::default_vdb_provides_cache()];
+ env->distribution()))[k::default_vdb_provides_cache()];
if (provides_cache.empty())
{
Log::get_instance()->message("e.vdb.configuration.no_provides_cache", ll_warning, lc_no_context)
@@ -319,7 +319,7 @@ VDBRepository::make_vdb_repository(
if (m->end() == m->find("names_cache") || ((names_cache = m->find("names_cache")->second)).empty())
{
names_cache = (*DistributionData::get_instance()->distribution_from_string(
- env->default_distribution()))[k::default_vdb_names_cache()];
+ env->distribution()))[k::default_vdb_names_cache()];
if (names_cache.empty())
{
Log::get_instance()->message("e.vdb.configuration.no_names_cache", ll_warning, lc_no_context)
@@ -334,7 +334,7 @@ VDBRepository::make_vdb_repository(
{
if (m->end() == m->find("buildroot") || ((builddir = m->find("buildroot")->second)).empty())
builddir = (*DistributionData::get_instance()->distribution_from_string(
- env->default_distribution()))[k::default_ebuild_builddir()];
+ env->distribution()))[k::default_ebuild_builddir()];
else
Log::get_instance()->message("e.vdb.configuration.deprecated", ll_warning, lc_context)
<< "Key 'buildroot' is deprecated, use 'builddir' instead";
diff --git a/paludis/repositories/fake/fake_repository.cc b/paludis/repositories/fake/fake_repository.cc
index a2d8a20..3e73df4 100644
--- a/paludis/repositories/fake/fake_repository.cc
+++ b/paludis/repositories/fake/fake_repository.cc
@@ -68,7 +68,7 @@ FakeRepository::FakeRepository(const Environment * const env, const RepositoryNa
(k::environment_variable_interface(), static_cast<RepositoryEnvironmentVariableInterface *>(0))
(k::provides_interface(), static_cast<RepositoryProvidesInterface *>(0))
(k::virtuals_interface(), (*DistributionData::get_instance()->distribution_from_string(
- env->default_distribution()))[k::support_old_style_virtuals()] ? this : 0)
+ env->distribution()))[k::support_old_style_virtuals()] ? this : 0)
(k::destination_interface(), static_cast<RepositoryDestinationInterface *>(0))
(k::e_interface(), static_cast<RepositoryEInterface *>(0))
(k::make_virtuals_interface(), static_cast<RepositoryMakeVirtualsInterface *>(0))
@@ -90,7 +90,7 @@ FakeRepository::FakeRepository(const FakeRepositoryParams & params) :
(k::environment_variable_interface(), static_cast<RepositoryEnvironmentVariableInterface *>(0))
(k::provides_interface(), static_cast<RepositoryProvidesInterface *>(0))
(k::virtuals_interface(), (*DistributionData::get_instance()->distribution_from_string(
- params.environment->default_distribution()))[k::support_old_style_virtuals()] ? this : 0)
+ params.environment->distribution()))[k::support_old_style_virtuals()] ? this : 0)
(k::destination_interface(), static_cast<RepositoryDestinationInterface *>(0))
(k::e_interface(), static_cast<RepositoryEInterface *>(0))
(k::make_virtuals_interface(), static_cast<RepositoryMakeVirtualsInterface *>(0))
diff --git a/paludis/repositories/gems/registration.cc b/paludis/repositories/gems/registration.cc
index 503918d..5b86062 100644
--- a/paludis/repositories/gems/registration.cc
+++ b/paludis/repositories/gems/registration.cc
@@ -56,7 +56,7 @@ namespace
std::string builddir;
if (m->end() == m->find("builddir") || ((builddir = m->find("builddir")->second)).empty())
- builddir = (*DistributionData::get_instance()->distribution_from_string(env->default_distribution()))[k::default_ebuild_builddir()];
+ builddir = (*DistributionData::get_instance()->distribution_from_string(env->distribution()))[k::default_ebuild_builddir()];
return make_shared_ptr(new GemsRepository(gems::RepositoryParams::create()
.location(location)
@@ -78,7 +78,7 @@ namespace
std::string builddir;
if (m->end() == m->find("builddir") || ((builddir = m->find("builddir")->second)).empty())
- builddir = (*DistributionData::get_instance()->distribution_from_string(env->default_distribution()))[k::default_ebuild_builddir()];
+ builddir = (*DistributionData::get_instance()->distribution_from_string(env->distribution()))[k::default_ebuild_builddir()];
std::string root;
if (m->end() == m->find("root") || ((root = m->find("root")->second)).empty())
diff --git a/python/additional_tests.cc b/python/additional_tests.cc
index 58ff005..72b79be 100644
--- a/python/additional_tests.cc
+++ b/python/additional_tests.cc
@@ -97,7 +97,7 @@ namespace environment
e.perform_hook(Hook("test"));
- e.default_distribution();
+ e.distribution();
}
}
diff --git a/python/environment.cc b/python/environment.cc
index cf1c3f6..a127eef 100644
--- a/python/environment.cc
+++ b/python/environment.cc
@@ -329,20 +329,20 @@ class EnvironmentImplementationWrapper :
return HookResult(0, "");
}
- virtual std::string default_distribution() const
+ virtual std::string distribution() const
PALUDIS_ATTRIBUTE((warn_unused_result))
{
Lock l(get_mutex());
- if (bp::override f = get_override("default_distribution"))
+ if (bp::override f = get_override("distribution"))
return f();
- return EnvironmentImplementation::default_distribution();
+ return EnvironmentImplementation::distribution();
}
- std::string default_default_distribution() const
+ std::string distribution() const
PALUDIS_ATTRIBUTE((warn_unused_result))
{
- return EnvironmentImplementation::default_distribution();
+ return EnvironmentImplementation::distribution();
}
virtual void add_to_world(const QualifiedPackageName & s) const
@@ -647,8 +647,8 @@ void expose_environment()
"Default destination candidates for installing packages."
)
- .def("default_distribution", &EnvImp::default_distribution, &EnvImpW::default_default_distribution,
- "default_distribution() -> str\n"
+ .def("distribution", &EnvImp::distribution, &EnvImpW::distribution,
+ "distribution() -> str\n"
"NEED_DOC"
)
diff --git a/python/environment_TEST.py b/python/environment_TEST.py
index e806cc2..fd6f69b 100755
--- a/python/environment_TEST.py
+++ b/python/environment_TEST.py
@@ -201,8 +201,8 @@ class TestCase_04_Environment_subclassingd(unittest.TestCase):
e = EnvironmentMaker.instance.make_from_spec("")
return [x for x in e.package_database.repositories]
- def default_distribution(self):
- return EnvironmentImplementation.default_distribution(self)
+ def distribution(self):
+ return EnvironmentImplementation.distribution(self)
def test_01_environment_implementation(self):
test_env(self.SubEnv())