aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e
diff options
context:
space:
mode:
Diffstat (limited to 'paludis/repositories/e')
-rw-r--r--paludis/repositories/e/e_repository.cc12
-rw-r--r--paludis/repositories/e/e_repository.hh2
-rw-r--r--paludis/repositories/e/ebuild_id.cc12
-rw-r--r--paludis/repositories/e/ebuild_id.hh2
-rw-r--r--paludis/repositories/e/exheres_layout.cc11
-rw-r--r--paludis/repositories/e/exheres_layout.hh2
-rw-r--r--paludis/repositories/e/exndbam_repository.cc5
-rw-r--r--paludis/repositories/e/exndbam_repository.hh2
-rw-r--r--paludis/repositories/e/layout.hh4
-rw-r--r--paludis/repositories/e/traditional_layout.cc11
-rw-r--r--paludis/repositories/e/traditional_layout.hh2
-rw-r--r--paludis/repositories/e/vdb_repository.cc5
-rw-r--r--paludis/repositories/e/vdb_repository.hh2
13 files changed, 1 insertions, 71 deletions
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(