aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-25 15:08:04 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-25 15:08:11 +0100
commit409725bee1592928dba1ea6c046ff6fc05c96da5 (patch)
treea6cbefac9bca995ab99269a99ca6617d3febef33
parent0c8a38fd5224c8caadee5aaf883ea96c25689db7 (diff)
downloadpaludis-409725bee1592928dba1ea6c046ff6fc05c96da5.tar.gz
paludis-409725bee1592928dba1ea6c046ff6fc05c96da5.tar.xz
Make optional pbins just affect cave, not repos
-rw-r--r--paludis/repositories/e/e_repository.cc8
1 files changed, 0 insertions, 8 deletions
diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc
index 67131e8..14d2c47 100644
--- a/paludis/repositories/e/e_repository.cc
+++ b/paludis/repositories/e/e_repository.cc
@@ -254,11 +254,9 @@ namespace paludis
std::shared_ptr<const MetadataValueKey<std::string> > use_manifest_key;
std::shared_ptr<const MetadataSectionKey> info_pkgs_key;
std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > info_vars_key;
-#ifdef ENABLE_PBINS
std::shared_ptr<const MetadataValueKey<std::string> > binary_destination_key;
std::shared_ptr<const MetadataValueKey<std::string> > binary_src_uri_prefix_key;
std::shared_ptr<const MetadataCollectionKey<Set<std::string> > > binary_keywords_filter;
-#endif
std::shared_ptr<const MetadataValueKey<FSEntry> > accounts_repository_data_location_key;
std::shared_ptr<const MetadataValueKey<FSEntry> > e_updates_location_key;
std::shared_ptr<const MetadataValueKey<std::string> > accept_keywords_key;
@@ -344,7 +342,6 @@ namespace paludis
std::make_shared<InfoVarsMetadataKey>(layout->info_variables_files()) :
std::shared_ptr<InfoVarsMetadataKey>()
),
-#ifdef ENABLE_PBINS
binary_destination_key(std::make_shared<LiteralMetadataValueKey<std::string> >(
"binary_destination", "binary_destination", params.binary_destination() ? mkt_normal : mkt_internal,
stringify(params.binary_destination()))),
@@ -354,7 +351,6 @@ namespace paludis
binary_keywords_filter(std::make_shared<LiteralMetadataStringSetKey>(
"binary_keywords_filter", "binary_keywords_filter", params.binary_destination() ? mkt_normal : mkt_internal,
make_binary_keywords_filter(params.binary_keywords_filter()))),
-#endif
accounts_repository_data_location_key(layout->accounts_repository_data_location_key()),
e_updates_location_key(layout->e_updates_location_key()),
sync_host_key(std::make_shared<LiteralMetadataValueKey<std::string> >("sync_host", "sync_host", mkt_internal, extract_host_from_url(params.sync()))),
@@ -555,11 +551,9 @@ ERepository::_add_metadata_keys() const
add_metadata_key(_imp->info_pkgs_key);
if (_imp->info_vars_key)
add_metadata_key(_imp->info_vars_key);
-#ifdef ENABLE_PBINS
add_metadata_key(_imp->binary_destination_key);
add_metadata_key(_imp->binary_src_uri_prefix_key);
add_metadata_key(_imp->binary_keywords_filter);
-#endif
if (_imp->accounts_repository_data_location_key)
add_metadata_key(_imp->accounts_repository_data_location_key);
if (_imp->e_updates_location_key)
@@ -1489,13 +1483,11 @@ ERepository::repository_factory_create(
bool binary_destination(false);
-#ifdef ENABLE_PBINS
if (! f("binary_destination").empty())
{
Context item_context("When handling binary_destination key:");
binary_destination = destringify<bool>(f("binary_destination"));
}
-#endif
std::string binary_uri_prefix(f("binary_uri_prefix"));