aboutsummaryrefslogtreecommitdiff
path: root/paludis/environments/paludis/paludis_environment.cc
diff options
context:
space:
mode:
Diffstat (limited to 'paludis/environments/paludis/paludis_environment.cc')
-rw-r--r--paludis/environments/paludis/paludis_environment.cc22
1 files changed, 1 insertions, 21 deletions
diff --git a/paludis/environments/paludis/paludis_environment.cc b/paludis/environments/paludis/paludis_environment.cc
index c92972f15..4bc180843 100644
--- a/paludis/environments/paludis/paludis_environment.cc
+++ b/paludis/environments/paludis/paludis_environment.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2013 Ciaran McCreesh
+ * Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2014 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -383,26 +383,6 @@ namespace
}
const std::shared_ptr<const Mask>
-PaludisEnvironment::mask_for_breakage(const std::shared_ptr<const PackageID> & id) const
-{
- if (! _imp->config->accept_all_breaks_portage())
- {
- std::shared_ptr<const Set<std::string> > breakages(id->breaks_portage());
- if (breakages)
- {
- std::list<std::string> bad_breakages;
- std::set_difference(breakages->begin(), breakages->end(),
- _imp->config->accept_breaks_portage().begin(), _imp->config->accept_breaks_portage().end(),
- std::back_inserter(bad_breakages));
- if (! bad_breakages.empty())
- return std::make_shared<BreaksPortageMask>(join(breakages->begin(), breakages->end(), " "));
- }
- }
-
- return std::shared_ptr<const Mask>();
-}
-
-const std::shared_ptr<const Mask>
PaludisEnvironment::mask_for_user(const std::shared_ptr<const PackageID> & d, const bool o) const
{
if (_imp->config->package_mask_conf()->query(d, ""))