diff options
author | 2011-03-18 20:20:00 +0000 | |
---|---|---|
committer | 2011-03-18 20:20:00 +0000 | |
commit | 48ad42d9704de00384315636f4e57bcae2592a54 (patch) | |
tree | 4fcfb10bbd762452d856c34ce5e592da61e5c803 | |
parent | 8195cdfd79b672c2097a4c652b8ebfaf6d8031a5 (diff) | |
download | paludis-48ad42d9704de00384315636f4e57bcae2592a54.tar.gz paludis-48ad42d9704de00384315636f4e57bcae2592a54.tar.xz |
Remove invalidate_masks
45 files changed, 1 insertions, 233 deletions
diff --git a/paludis/package_id.cc b/paludis/package_id.cc index f3c87fed3..1eafa8cec 100644 --- a/paludis/package_id.cc +++ b/paludis/package_id.cc @@ -119,13 +119,6 @@ PackageID::masked() const return begin_masks() != end_masks(); } -void -PackageID::invalidate_masks() const -{ - _imp->masks.clear(); - _imp->overridden_masks.clear(); -} - std::ostream & paludis::operator<< (std::ostream & s, const PackageID & i) { diff --git a/paludis/package_id.hh b/paludis/package_id.hh index aa71df1ad..37976d4c2 100644 --- a/paludis/package_id.hh +++ b/paludis/package_id.hh @@ -368,15 +368,6 @@ namespace paludis bool masked() const PALUDIS_ATTRIBUTE((warn_unused_result)); /** - * Invalidate any masks. - * - * PackageID implementations may cache masks. This can cause - * problems if the operating environment changes. Calling this - * method will clear any masks held by the PackageID. - */ - virtual void invalidate_masks() const; - - /** * Do we break Portage, and if so, why? * * This method may be used by Environment implementations to apply a "we don't diff --git a/paludis/repositories/accounts/accounts_repository.cc b/paludis/repositories/accounts/accounts_repository.cc index 4a1fd33ae..8b3094267 100644 --- a/paludis/repositories/accounts/accounts_repository.cc +++ b/paludis/repositories/accounts/accounts_repository.cc @@ -280,11 +280,6 @@ AccountsRepository::invalidate() } void -AccountsRepository::invalidate_masks() -{ -} - -void AccountsRepository::regenerate_cache() const { } diff --git a/paludis/repositories/accounts/accounts_repository.hh b/paludis/repositories/accounts/accounts_repository.hh index 3b8aff3f0..0c6cc0919 100644 --- a/paludis/repositories/accounts/accounts_repository.hh +++ b/paludis/repositories/accounts/accounts_repository.hh @@ -138,7 +138,6 @@ namespace paludis ///\{ virtual void invalidate(); - virtual void invalidate_masks(); virtual void regenerate_cache() const; virtual HookResult perform_hook( diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc index dfbc771bd..1336f8d57 100644 --- a/paludis/repositories/e/e_repository.cc +++ b/paludis/repositories/e/e_repository.cc @@ -838,18 +838,6 @@ ERepository::purge_invalid_cache() const } void -ERepository::invalidate_masks() -{ - _imp->layout->invalidate_masks(); - - if ((*DistributionData::get_instance()->distribution_from_string(_imp->params.environment()->distribution())) - .support_old_style_virtuals()) - if (_imp->params.environment()->package_database()->has_repository_named(RepositoryName("virtuals"))) - _imp->params.environment()->package_database()->fetch_repository( - RepositoryName("virtuals"))->invalidate_masks(); -} - -void ERepository::update_news() const { Lock l(_imp->mutexes->news_ptr_mutex); diff --git a/paludis/repositories/e/e_repository.hh b/paludis/repositories/e/e_repository.hh index b7b2e497f..ef94d81bd 100644 --- a/paludis/repositories/e/e_repository.hh +++ b/paludis/repositories/e/e_repository.hh @@ -82,8 +82,6 @@ namespace paludis virtual void invalidate(); - virtual void invalidate_masks(); - virtual void purge_invalid_cache() const; /* RepositoryVirtualsInterface */ diff --git a/paludis/repositories/e/ebuild_id.cc b/paludis/repositories/e/ebuild_id.cc index 4e89ac121..d2d884e1b 100644 --- a/paludis/repositories/e/ebuild_id.cc +++ b/paludis/repositories/e/ebuild_id.cc @@ -616,18 +616,6 @@ EbuildID::need_masks_added() const add_mask(breaks_mask); } -void -EbuildID::invalidate_masks() const -{ - Lock l(_imp->mutex); - - if (! _imp->has_masks) - return; - - _imp->has_masks = false; - PackageID::invalidate_masks(); -} - const std::string EbuildID::canonical_form(const PackageIDCanonicalForm f) const { diff --git a/paludis/repositories/e/ebuild_id.hh b/paludis/repositories/e/ebuild_id.hh index 67f34c1c5..28605084c 100644 --- a/paludis/repositories/e/ebuild_id.hh +++ b/paludis/repositories/e/ebuild_id.hh @@ -160,8 +160,6 @@ namespace paludis virtual const std::shared_ptr<const EAPI> eapi() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void invalidate_masks() const; - virtual const std::shared_ptr<const ChoiceValue> make_choice_value( const std::shared_ptr<const Choice> &, const UnprefixedChoiceName &, const Tribool, const bool, const bool, const std::string &, const bool) const; diff --git a/paludis/repositories/e/exheres_layout.cc b/paludis/repositories/e/exheres_layout.cc index 8d9c22ca5..a37879cad 100644 --- a/paludis/repositories/e/exheres_layout.cc +++ b/paludis/repositories/e/exheres_layout.cc @@ -619,17 +619,6 @@ ExheresLayout::manifest_files(const QualifiedPackageName & qpn) const return result; } -void -ExheresLayout::invalidate_masks() -{ - Lock l(_imp->big_nasty_mutex); - - for (IDMap::iterator it(_imp->ids.begin()), it_end(_imp->ids.end()); it_end != it; ++it) - for (PackageIDSequence::ConstIterator it2(it->second->begin()), it2_end(it->second->end()); - it2_end != it2; ++it2) - (*it2)->invalidate_masks(); -} - FSPath ExheresLayout::binary_ebuild_location(const QualifiedPackageName & q, const VersionSpec & v, const std::string & eapi) const diff --git a/paludis/repositories/e/exheres_layout.hh b/paludis/repositories/e/exheres_layout.hh index ec3c90c69..8ea3b2b93 100644 --- a/paludis/repositories/e/exheres_layout.hh +++ b/paludis/repositories/e/exheres_layout.hh @@ -130,8 +130,6 @@ namespace paludis virtual std::shared_ptr<MetadataValueKey<FSPath> > e_updates_location_key() const PALUDIS_ATTRIBUTE((warn_unused_result)); - - virtual void invalidate_masks(); }; } } diff --git a/paludis/repositories/e/exndbam_repository.cc b/paludis/repositories/e/exndbam_repository.cc index 86b4c6a24..9177c0e9a 100644 --- a/paludis/repositories/e/exndbam_repository.cc +++ b/paludis/repositories/e/exndbam_repository.cc @@ -199,11 +199,6 @@ ExndbamRepository::invalidate() _add_metadata_keys(); } -void -ExndbamRepository::invalidate_masks() -{ -} - std::shared_ptr<const PackageIDSequence> ExndbamRepository::package_ids(const QualifiedPackageName & q, const RepositoryContentMayExcludes &) const diff --git a/paludis/repositories/e/exndbam_repository.hh b/paludis/repositories/e/exndbam_repository.hh index ea9800f2b..4a4bb8fb9 100644 --- a/paludis/repositories/e/exndbam_repository.hh +++ b/paludis/repositories/e/exndbam_repository.hh @@ -77,8 +77,6 @@ namespace paludis virtual void invalidate(); - virtual void invalidate_masks(); - virtual void regenerate_cache() const; /* RepositoryDestinationInterface */ diff --git a/paludis/repositories/e/layout.hh b/paludis/repositories/e/layout.hh index 54388c480..c43c29617 100644 --- a/paludis/repositories/e/layout.hh +++ b/paludis/repositories/e/layout.hh @@ -1,7 +1,7 @@ /* vim: set sw=4 sts=4 et foldmethod=syntax : */ /* - * Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010 Ciaran McCreesh + * Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Ciaran McCreesh * Copyright (c) 2006 Danny van Dyk * * This file is part of the Paludis package manager. Paludis is free software; @@ -156,8 +156,6 @@ namespace paludis virtual FSPath sync_filter_file() const; - virtual void invalidate_masks() = 0; - ///\} }; diff --git a/paludis/repositories/e/traditional_layout.cc b/paludis/repositories/e/traditional_layout.cc index 80dbda1ce..4dda29db7 100644 --- a/paludis/repositories/e/traditional_layout.cc +++ b/paludis/repositories/e/traditional_layout.cc @@ -635,17 +635,6 @@ TraditionalLayout::sync_filter_file() const return FSPath(DATADIR "/paludis/traditional.exclude"); } -void -TraditionalLayout::invalidate_masks() -{ - Lock l(_imp->big_nasty_mutex); - - for (IDMap::iterator it(_imp->ids.begin()), it_end(_imp->ids.end()); it_end != it; ++it) - for (PackageIDSequence::ConstIterator it2(it->second->begin()), it2_end(it->second->end()); - it2_end != it2; ++it2) - (*it2)->invalidate_masks(); -} - FSPath TraditionalLayout::binary_ebuild_location(const QualifiedPackageName & q, const VersionSpec & v, const std::string & eapi) const diff --git a/paludis/repositories/e/traditional_layout.hh b/paludis/repositories/e/traditional_layout.hh index 62cdd683f..2385e5bc7 100644 --- a/paludis/repositories/e/traditional_layout.hh +++ b/paludis/repositories/e/traditional_layout.hh @@ -134,8 +134,6 @@ namespace paludis PALUDIS_ATTRIBUTE((warn_unused_result)); virtual FSPath sync_filter_file() const; - - virtual void invalidate_masks(); }; } } diff --git a/paludis/repositories/e/vdb_repository.cc b/paludis/repositories/e/vdb_repository.cc index 020608980..efc673faa 100644 --- a/paludis/repositories/e/vdb_repository.cc +++ b/paludis/repositories/e/vdb_repository.cc @@ -572,11 +572,6 @@ VDBRepository::invalidate() _add_metadata_keys(); } -void -VDBRepository::invalidate_masks() -{ -} - std::shared_ptr<const RepositoryProvidesInterface::ProvidesSequence> VDBRepository::provided_packages() const { diff --git a/paludis/repositories/e/vdb_repository.hh b/paludis/repositories/e/vdb_repository.hh index f027e2bfc..a57876a60 100644 --- a/paludis/repositories/e/vdb_repository.hh +++ b/paludis/repositories/e/vdb_repository.hh @@ -116,8 +116,6 @@ namespace paludis virtual void invalidate(); - virtual void invalidate_masks(); - virtual void regenerate_cache() const; virtual void perform_uninstall( diff --git a/paludis/repositories/fake/fake_package_id.cc b/paludis/repositories/fake/fake_package_id.cc index 37b9e7ebf..ed1691af5 100644 --- a/paludis/repositories/fake/fake_package_id.cc +++ b/paludis/repositories/fake/fake_package_id.cc @@ -1093,18 +1093,6 @@ FakePackageID::need_masks_added() const add_mask(_imp->unsupported_mask); } -void -FakePackageID::invalidate_masks() const -{ - Lock l(_imp->mutex); - - if (! _imp->has_masks) - return; - - _imp->has_masks = false; - PackageID::invalidate_masks(); -} - namespace { struct PerformAction diff --git a/paludis/repositories/fake/fake_package_id.hh b/paludis/repositories/fake/fake_package_id.hh index a2ecd1996..2b324de6e 100644 --- a/paludis/repositories/fake/fake_package_id.hh +++ b/paludis/repositories/fake/fake_package_id.hh @@ -294,8 +294,6 @@ namespace paludis virtual std::shared_ptr<const Set<std::string> > breaks_portage() const PALUDIS_ATTRIBUTE((warn_unused_result)); - virtual void invalidate_masks() const; - }; } diff --git a/paludis/repositories/fake/fake_repository_base.cc b/paludis/repositories/fake/fake_repository_base.cc index edfc7f46f..a45a825c1 100644 --- a/paludis/repositories/fake/fake_repository_base.cc +++ b/paludis/repositories/fake/fake_repository_base.cc @@ -175,16 +175,6 @@ FakeRepositoryBase::invalidate() { } -void -FakeRepositoryBase::invalidate_masks() -{ - for (std::map<QualifiedPackageName, std::shared_ptr<PackageIDSequence> >::iterator it(_imp->ids.begin()), it_end(_imp->ids.end()); - it_end != it; ++it) - for (PackageIDSequence::ConstIterator it2(it->second->begin()), it2_end(it->second->end()); - it2_end != it2; ++it2) - (*it2)->invalidate_masks(); -} - const Environment * FakeRepositoryBase::environment() const { diff --git a/paludis/repositories/fake/fake_repository_base.hh b/paludis/repositories/fake/fake_repository_base.hh index 2abfd0842..a97b848c5 100644 --- a/paludis/repositories/fake/fake_repository_base.hh +++ b/paludis/repositories/fake/fake_repository_base.hh @@ -90,8 +90,6 @@ namespace paludis virtual void invalidate(); - virtual void invalidate_masks(); - /** * Fetch our associated environment. */ diff --git a/paludis/repositories/gemcutter/gemcutter_repository.cc b/paludis/repositories/gemcutter/gemcutter_repository.cc index 073949dfb..563e6cd77 100644 --- a/paludis/repositories/gemcutter/gemcutter_repository.cc +++ b/paludis/repositories/gemcutter/gemcutter_repository.cc @@ -150,11 +150,6 @@ GemcutterRepository::invalidate() _add_metadata_keys(); } -void -GemcutterRepository::invalidate_masks() -{ -} - bool GemcutterRepository::has_category_named(const CategoryNamePart & c, const RepositoryContentMayExcludes &) const { diff --git a/paludis/repositories/gemcutter/gemcutter_repository.hh b/paludis/repositories/gemcutter/gemcutter_repository.hh index e2910cebb..ea08595d0 100644 --- a/paludis/repositories/gemcutter/gemcutter_repository.hh +++ b/paludis/repositories/gemcutter/gemcutter_repository.hh @@ -88,7 +88,6 @@ namespace paludis virtual bool some_ids_might_support_action(const SupportsActionTestBase &) const; virtual bool some_ids_might_not_be_masked() const; virtual void invalidate(); - virtual void invalidate_masks(); virtual bool sync(const std::string &, const std::shared_ptr<OutputManager> &) const; diff --git a/paludis/repositories/repository/repository_repository.cc b/paludis/repositories/repository/repository_repository.cc index 388d5c3c9..8718a4be5 100644 --- a/paludis/repositories/repository/repository_repository.cc +++ b/paludis/repositories/repository/repository_repository.cc @@ -162,11 +162,6 @@ RepositoryRepository::invalidate() _add_metadata_keys(); } -void -RepositoryRepository::invalidate_masks() -{ -} - bool RepositoryRepository::has_category_named(const CategoryNamePart & c, const RepositoryContentMayExcludes &) const { diff --git a/paludis/repositories/repository/repository_repository.hh b/paludis/repositories/repository/repository_repository.hh index 73bea03e4..006ad7b16 100644 --- a/paludis/repositories/repository/repository_repository.hh +++ b/paludis/repositories/repository/repository_repository.hh @@ -94,7 +94,6 @@ namespace paludis virtual bool some_ids_might_support_action(const SupportsActionTestBase &) const; virtual bool some_ids_might_not_be_masked() const; virtual void invalidate(); - virtual void invalidate_masks(); virtual bool sync(const std::string &, const std::shared_ptr<OutputManager> &) const; diff --git a/paludis/repositories/unavailable/unavailable_repository.cc b/paludis/repositories/unavailable/unavailable_repository.cc index bfcca8c82..428b77d80 100644 --- a/paludis/repositories/unavailable/unavailable_repository.cc +++ b/paludis/repositories/unavailable/unavailable_repository.cc @@ -171,11 +171,6 @@ UnavailableRepository::invalidate() _add_metadata_keys(); } -void -UnavailableRepository::invalidate_masks() -{ -} - bool UnavailableRepository::has_category_named(const CategoryNamePart & c, const RepositoryContentMayExcludes & x) const { diff --git a/paludis/repositories/unavailable/unavailable_repository.hh b/paludis/repositories/unavailable/unavailable_repository.hh index 140d5c1cb..fdab7db99 100644 --- a/paludis/repositories/unavailable/unavailable_repository.hh +++ b/paludis/repositories/unavailable/unavailable_repository.hh @@ -93,7 +93,6 @@ namespace paludis virtual bool some_ids_might_support_action(const SupportsActionTestBase &) const; virtual bool some_ids_might_not_be_masked() const; virtual void invalidate(); - virtual void invalidate_masks(); virtual bool sync(const std::string &, const std::shared_ptr<OutputManager> &) const; diff --git a/paludis/repositories/unpackaged/installed_id.cc b/paludis/repositories/unpackaged/installed_id.cc index e703515b4..29d0edd29 100644 --- a/paludis/repositories/unpackaged/installed_id.cc +++ b/paludis/repositories/unpackaged/installed_id.cc @@ -790,11 +790,6 @@ InstalledUnpackagedID::perform_action(Action & action) const action.accept(v); } -void -InstalledUnpackagedID::invalidate_masks() const -{ -} - std::shared_ptr<const Set<std::string> > InstalledUnpackagedID::breaks_portage() const { diff --git a/paludis/repositories/unpackaged/installed_id.hh b/paludis/repositories/unpackaged/installed_id.hh index 875a34134..04a20505f 100644 --- a/paludis/repositories/unpackaged/installed_id.hh +++ b/paludis/repositories/unpackaged/installed_id.hh @@ -81,7 +81,6 @@ namespace paludis virtual bool supports_action(const SupportsActionTestBase &) const PALUDIS_ATTRIBUTE((warn_unused_result)); virtual void perform_action(Action &) const; - virtual void invalidate_masks() const; virtual std::shared_ptr<const Set<std::string> > breaks_portage() const PALUDIS_ATTRIBUTE((warn_unused_result)); virtual bool arbitrary_less_than_comparison(const PackageID &) const PALUDIS_ATTRIBUTE((warn_unused_result)); diff --git a/paludis/repositories/unpackaged/installed_repository.cc b/paludis/repositories/unpackaged/installed_repository.cc index a2daa15fa..7d064f140 100644 --- a/paludis/repositories/unpackaged/installed_repository.cc +++ b/paludis/repositories/unpackaged/installed_repository.cc @@ -427,11 +427,6 @@ InstalledUnpackagedRepository::invalidate() } void -InstalledUnpackagedRepository::invalidate_masks() -{ -} - -void InstalledUnpackagedRepository::deindex(const QualifiedPackageName & q) const { _imp->ndbam.deindex(q); diff --git a/paludis/repositories/unpackaged/installed_repository.hh b/paludis/repositories/unpackaged/installed_repository.hh index 6180fea10..d364fa209 100644 --- a/paludis/repositories/unpackaged/installed_repository.hh +++ b/paludis/repositories/unpackaged/installed_repository.hh @@ -64,7 +64,6 @@ namespace paludis ~InstalledUnpackagedRepository(); virtual void invalidate(); - virtual void invalidate_masks(); virtual bool is_suitable_destination_for(const std::shared_ptr<const PackageID> &) const PALUDIS_ATTRIBUTE((warn_unused_result)); diff --git a/paludis/repositories/unpackaged/unpackaged_id.cc b/paludis/repositories/unpackaged/unpackaged_id.cc index 12db7bc83..379782192 100644 --- a/paludis/repositories/unpackaged/unpackaged_id.cc +++ b/paludis/repositories/unpackaged/unpackaged_id.cc @@ -511,11 +511,6 @@ UnpackagedID::perform_action(Action & action) const output_manager->succeeded(); } -void -UnpackagedID::invalidate_masks() const -{ -} - std::shared_ptr<const Set<std::string> > UnpackagedID::breaks_portage() const { diff --git a/paludis/repositories/unpackaged/unpackaged_id.hh b/paludis/repositories/unpackaged/unpackaged_id.hh index 8b849362b..474d9557d 100644 --- a/paludis/repositories/unpackaged/unpackaged_id.hh +++ b/paludis/repositories/unpackaged/unpackaged_id.hh @@ -83,7 +83,6 @@ namespace paludis virtual bool supports_action(const SupportsActionTestBase &) const PALUDIS_ATTRIBUTE((warn_unused_result)); virtual void perform_action(Action &) const; - virtual void invalidate_masks() const; virtual std::shared_ptr<const Set<std::string> > breaks_portage() const PALUDIS_ATTRIBUTE((warn_unused_result)); virtual bool arbitrary_less_than_comparison(const PackageID &) const PALUDIS_ATTRIBUTE((warn_unused_result)); diff --git a/paludis/repositories/unpackaged/unpackaged_repository.cc b/paludis/repositories/unpackaged/unpackaged_repository.cc index 48ee616c1..6474c26b9 100644 --- a/paludis/repositories/unpackaged/unpackaged_repository.cc +++ b/paludis/repositories/unpackaged/unpackaged_repository.cc @@ -188,11 +188,6 @@ UnpackagedRepository::invalidate() } void -UnpackagedRepository::invalidate_masks() -{ -} - -void UnpackagedRepository::need_keys_added() const { } diff --git a/paludis/repositories/unpackaged/unpackaged_repository.hh b/paludis/repositories/unpackaged/unpackaged_repository.hh index e758c900d..c3129c42c 100644 --- a/paludis/repositories/unpackaged/unpackaged_repository.hh +++ b/paludis/repositories/unpackaged/unpackaged_repository.hh @@ -81,7 +81,6 @@ namespace paludis ~UnpackagedRepository(); virtual void invalidate(); - virtual void invalidate_masks(); virtual std::shared_ptr<const PackageIDSequence> package_ids( const QualifiedPackageName &, const RepositoryContentMayExcludes &) const diff --git a/paludis/repositories/unwritten/unwritten_repository.cc b/paludis/repositories/unwritten/unwritten_repository.cc index 94cd46b06..9bf0aa64e 100644 --- a/paludis/repositories/unwritten/unwritten_repository.cc +++ b/paludis/repositories/unwritten/unwritten_repository.cc @@ -165,11 +165,6 @@ UnwrittenRepository::invalidate() _add_metadata_keys(); } -void -UnwrittenRepository::invalidate_masks() -{ -} - bool UnwrittenRepository::has_category_named(const CategoryNamePart & c, const RepositoryContentMayExcludes &) const { diff --git a/paludis/repositories/unwritten/unwritten_repository.hh b/paludis/repositories/unwritten/unwritten_repository.hh index ecd914ba4..7abde049a 100644 --- a/paludis/repositories/unwritten/unwritten_repository.hh +++ b/paludis/repositories/unwritten/unwritten_repository.hh @@ -92,7 +92,6 @@ namespace paludis virtual bool some_ids_might_support_action(const SupportsActionTestBase &) const; virtual bool some_ids_might_not_be_masked() const; virtual void invalidate(); - virtual void invalidate_masks(); virtual bool sync(const std::string &, const std::shared_ptr<OutputManager> & output_manager) const; diff --git a/paludis/repositories/virtuals/installed_virtuals_repository.cc b/paludis/repositories/virtuals/installed_virtuals_repository.cc index 06f223bc9..413b8bf55 100644 --- a/paludis/repositories/virtuals/installed_virtuals_repository.cc +++ b/paludis/repositories/virtuals/installed_virtuals_repository.cc @@ -223,11 +223,6 @@ InstalledVirtualsRepository::invalidate() _imp.reset(new Imp<InstalledVirtualsRepository>(_imp->env, _imp->root, _imp->ids_mutex)); } -void -InstalledVirtualsRepository::invalidate_masks() -{ -} - HookResult InstalledVirtualsRepository::perform_hook(const Hook & hook, const std::shared_ptr<OutputManager> &) { diff --git a/paludis/repositories/virtuals/installed_virtuals_repository.hh b/paludis/repositories/virtuals/installed_virtuals_repository.hh index d946e217c..037232d03 100644 --- a/paludis/repositories/virtuals/installed_virtuals_repository.hh +++ b/paludis/repositories/virtuals/installed_virtuals_repository.hh @@ -78,8 +78,6 @@ namespace paludis virtual void invalidate(); - virtual void invalidate_masks(); - virtual bool can_be_favourite_repository() const; virtual const bool is_unimportant() const; diff --git a/paludis/repositories/virtuals/package_id.cc b/paludis/repositories/virtuals/package_id.cc index d96ec3d34..dcad0e4b6 100644 --- a/paludis/repositories/virtuals/package_id.cc +++ b/paludis/repositories/virtuals/package_id.cc @@ -501,18 +501,6 @@ VirtualsPackageID::need_masks_added() const _imp->has_masks = true; } -void -VirtualsPackageID::invalidate_masks() const -{ - Lock l(_imp->mutex); - - if (! _imp->has_masks) - return; - - _imp->has_masks = false; - PackageID::invalidate_masks(); -} - std::shared_ptr<const Set<std::string> > VirtualsPackageID::breaks_portage() const { diff --git a/paludis/repositories/virtuals/package_id.hh b/paludis/repositories/virtuals/package_id.hh index ef1f5f2ee..3c179158d 100644 --- a/paludis/repositories/virtuals/package_id.hh +++ b/paludis/repositories/virtuals/package_id.hh @@ -115,8 +115,6 @@ namespace paludis PALUDIS_ATTRIBUTE((warn_unused_result)); virtual std::shared_ptr<const Set<std::string> > breaks_portage() const PALUDIS_ATTRIBUTE((warn_unused_result)); - - virtual void invalidate_masks() const; }; } } diff --git a/paludis/repositories/virtuals/virtuals_repository.cc b/paludis/repositories/virtuals/virtuals_repository.cc index c2270aed2..86dec7938 100644 --- a/paludis/repositories/virtuals/virtuals_repository.cc +++ b/paludis/repositories/virtuals/virtuals_repository.cc @@ -316,17 +316,6 @@ VirtualsRepository::invalidate() _imp.reset(new Imp<VirtualsRepository>(_imp->env, _imp->big_nasty_mutex)); } -void -VirtualsRepository::invalidate_masks() -{ - Lock l(*_imp->big_nasty_mutex); - - for (IDMap::iterator it(_imp->ids.begin()), it_end(_imp->ids.end()); it_end != it; ++it) - for (PackageIDSequence::ConstIterator it2(it->second->begin()), it2_end(it->second->end()); - it2_end != it2; ++it2) - (*it2)->invalidate_masks(); -} - const std::shared_ptr<const PackageID> VirtualsRepository::make_virtual_package_id( const QualifiedPackageName & virtual_name, const std::shared_ptr<const PackageID> & provider) const diff --git a/paludis/repositories/virtuals/virtuals_repository.hh b/paludis/repositories/virtuals/virtuals_repository.hh index e1029609a..c83a299ff 100644 --- a/paludis/repositories/virtuals/virtuals_repository.hh +++ b/paludis/repositories/virtuals/virtuals_repository.hh @@ -78,8 +78,6 @@ namespace paludis virtual void invalidate(); - virtual void invalidate_masks(); - virtual bool can_be_favourite_repository() const; virtual const bool is_unimportant() const; diff --git a/paludis/repository.hh b/paludis/repository.hh index eba8c1e88..66f0c8005 100644 --- a/paludis/repository.hh +++ b/paludis/repository.hh @@ -435,11 +435,6 @@ namespace paludis virtual void invalidate() = 0; /** - * Invalidate cached masks. - */ - virtual void invalidate_masks() = 0; - - /** * Regenerate any on disk cache. */ virtual void regenerate_cache() const; diff --git a/ruby/package_id.cc b/ruby/package_id.cc index f8e9b8c8b..16b048e76 100644 --- a/ruby/package_id.cc +++ b/ruby/package_id.cc @@ -261,32 +261,6 @@ namespace /* * call-seq: - * invalidate_masks -> Qnil - * - * Invalidate any masks. - * - * PackageID implementations may cache masks. This can cause problems if the operating environment changes. - * Calling this method will clear any masks held by the PackageID. - */ - VALUE - package_id_invalidate_masks(VALUE self) - { - std::shared_ptr<const PackageID> * self_ptr; - Data_Get_Struct(self, std::shared_ptr<const PackageID>, self_ptr); - try - { - (*self_ptr)->invalidate_masks(); - } - catch (const std::exception & e) - { - exception_to_ruby_exception(e); - } - - return Qnil; - } - - /* - * call-seq: * breaks_portage -> [:reason, :reason, ...] * * Do we break Portage, and if so, why? @@ -515,7 +489,6 @@ namespace rb_define_method(c_package_id, "masks", RUBY_FUNC_CAST(&package_id_masks), 0); rb_define_method(c_package_id, "masked?", RUBY_FUNC_CAST((&PackageIDBool<&PackageID::masked>::fetch)), 0); - rb_define_method(c_package_id, "invalidate_masks", RUBY_FUNC_CAST(&package_id_invalidate_masks), 0); rb_define_method(c_package_id, "breaks_portage", RUBY_FUNC_CAST(&package_id_breaks_portage), 0); rb_define_method(c_package_id, "virtual_for_key", RUBY_FUNC_CAST((&KeyValue<MetadataValueKey<std::shared_ptr<const PackageID> > , &PackageID::virtual_for_key>::fetch)), 0); |