aboutsummaryrefslogtreecommitdiff
path: root/paludis/environments
diff options
context:
space:
mode:
Diffstat (limited to 'paludis/environments')
-rw-r--r--paludis/environments/no_config/no_config_environment.cc2
-rw-r--r--paludis/environments/no_config/no_config_environment.hh2
-rw-r--r--paludis/environments/paludis/package_mask_conf.cc2
-rw-r--r--paludis/environments/paludis/package_mask_conf.hh3
-rw-r--r--paludis/environments/paludis/paludis_environment.cc6
-rw-r--r--paludis/environments/paludis/paludis_environment.hh2
-rw-r--r--paludis/environments/portage/portage_environment.cc2
-rw-r--r--paludis/environments/portage/portage_environment.hh2
-rw-r--r--paludis/environments/test/test_environment.cc2
-rw-r--r--paludis/environments/test/test_environment.hh2
10 files changed, 13 insertions, 12 deletions
diff --git a/paludis/environments/no_config/no_config_environment.cc b/paludis/environments/no_config/no_config_environment.cc
index 103da45e9..07ecaa7c7 100644
--- a/paludis/environments/no_config/no_config_environment.cc
+++ b/paludis/environments/no_config/no_config_environment.cc
@@ -503,7 +503,7 @@ NoConfigEnvironment::remove_from_world(const SetName &) const
}
bool
-NoConfigEnvironment::unmasked_by_user(const std::shared_ptr<const PackageID> &) const
+NoConfigEnvironment::unmasked_by_user(const std::shared_ptr<const PackageID> &, const std::string &) const
{
return false;
}
diff --git a/paludis/environments/no_config/no_config_environment.hh b/paludis/environments/no_config/no_config_environment.hh
index 5a1ea8368..575927a30 100644
--- a/paludis/environments/no_config/no_config_environment.hh
+++ b/paludis/environments/no_config/no_config_environment.hh
@@ -190,7 +190,7 @@ namespace paludis
virtual const std::shared_ptr<const Mask> mask_for_user(const std::shared_ptr<const PackageID> &, const bool will_be_used_for_overridden) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual bool unmasked_by_user(const std::shared_ptr<const PackageID> &) const
+ virtual bool unmasked_by_user(const std::shared_ptr<const PackageID> &, const std::string &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual std::shared_ptr<const FSPathSequence> hook_dirs() const
diff --git a/paludis/environments/paludis/package_mask_conf.cc b/paludis/environments/paludis/package_mask_conf.cc
index 4814e0edc..5287fc7e1 100644
--- a/paludis/environments/paludis/package_mask_conf.cc
+++ b/paludis/environments/paludis/package_mask_conf.cc
@@ -98,7 +98,7 @@ PackageMaskConf::add(const FSPath & filename)
}
bool
-PackageMaskConf::query(const std::shared_ptr<const PackageID> & e) const
+PackageMaskConf::query(const std::shared_ptr<const PackageID> & e, const std::string &) const
{
using namespace std::placeholders;
if (indirect_iterator(_imp->masks.end()) != std::find_if(
diff --git a/paludis/environments/paludis/package_mask_conf.hh b/paludis/environments/paludis/package_mask_conf.hh
index 8cd6568d8..cb927d073 100644
--- a/paludis/environments/paludis/package_mask_conf.hh
+++ b/paludis/environments/paludis/package_mask_conf.hh
@@ -63,7 +63,8 @@ namespace paludis
/**
* Query a mask.
*/
- bool query(const std::shared_ptr<const PackageID> &) const;
+ bool query(const std::shared_ptr<const PackageID> &,
+ const std::string &) const;
};
}
}
diff --git a/paludis/environments/paludis/paludis_environment.cc b/paludis/environments/paludis/paludis_environment.cc
index 1eea30535..8ec4bc9eb 100644
--- a/paludis/environments/paludis/paludis_environment.cc
+++ b/paludis/environments/paludis/paludis_environment.cc
@@ -192,9 +192,9 @@ PaludisEnvironment::accept_license(const std::string & license, const std::share
}
bool
-PaludisEnvironment::unmasked_by_user(const std::shared_ptr<const PackageID> & d) const
+PaludisEnvironment::unmasked_by_user(const std::shared_ptr<const PackageID> & d, const std::string & reason) const
{
- return _imp->config->package_unmask_conf()->query(d);
+ return _imp->config->package_unmask_conf()->query(d, reason);
}
std::shared_ptr<const FSPathSequence>
@@ -431,7 +431,7 @@ PaludisEnvironment::mask_for_breakage(const std::shared_ptr<const PackageID> & i
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))
+ if (_imp->config->package_mask_conf()->query(d, ""))
return std::make_shared<UserConfigMask>(o);
return std::shared_ptr<const Mask>();
diff --git a/paludis/environments/paludis/paludis_environment.hh b/paludis/environments/paludis/paludis_environment.hh
index 8cbb899f6..14deb9b9b 100644
--- a/paludis/environments/paludis/paludis_environment.hh
+++ b/paludis/environments/paludis/paludis_environment.hh
@@ -126,7 +126,7 @@ namespace paludis
virtual const std::shared_ptr<const Mask> mask_for_user(const std::shared_ptr<const PackageID> &, const bool) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual bool unmasked_by_user(const std::shared_ptr<const PackageID> &) const
+ virtual bool unmasked_by_user(const std::shared_ptr<const PackageID> &, const std::string &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual bool add_to_world(const QualifiedPackageName &) const;
diff --git a/paludis/environments/portage/portage_environment.cc b/paludis/environments/portage/portage_environment.cc
index adc2ffde3..eb1ace491 100644
--- a/paludis/environments/portage/portage_environment.cc
+++ b/paludis/environments/portage/portage_environment.cc
@@ -672,7 +672,7 @@ PortageEnvironment::accept_keywords(const std::shared_ptr <const KeywordNameSet>
}
bool
-PortageEnvironment::unmasked_by_user(const std::shared_ptr<const PackageID> & e) const
+PortageEnvironment::unmasked_by_user(const std::shared_ptr<const PackageID> & e, const std::string &) const
{
for (PackageUnmask::const_iterator i(_imp->package_unmask.begin()), i_end(_imp->package_unmask.end()) ;
i != i_end ; ++i)
diff --git a/paludis/environments/portage/portage_environment.hh b/paludis/environments/portage/portage_environment.hh
index 2174833c4..a309f74df 100644
--- a/paludis/environments/portage/portage_environment.hh
+++ b/paludis/environments/portage/portage_environment.hh
@@ -152,7 +152,7 @@ namespace paludis
virtual const std::shared_ptr<const Mask> mask_for_user(const std::shared_ptr<const PackageID> &, const bool) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual bool unmasked_by_user(const std::shared_ptr<const PackageID> &) const
+ virtual bool unmasked_by_user(const std::shared_ptr<const PackageID> &, const std::string &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual uid_t reduced_uid() const;
diff --git a/paludis/environments/test/test_environment.cc b/paludis/environments/test/test_environment.cc
index 6394cf379..eb84fc6f0 100644
--- a/paludis/environments/test/test_environment.cc
+++ b/paludis/environments/test/test_environment.cc
@@ -189,7 +189,7 @@ TestEnvironment::mask_for_user(const std::shared_ptr<const PackageID> &, const b
}
bool
-TestEnvironment::unmasked_by_user(const std::shared_ptr<const PackageID> &) const
+TestEnvironment::unmasked_by_user(const std::shared_ptr<const PackageID> &, const std::string &) const
{
return false;
}
diff --git a/paludis/environments/test/test_environment.hh b/paludis/environments/test/test_environment.hh
index c4996839b..7d356219e 100644
--- a/paludis/environments/test/test_environment.hh
+++ b/paludis/environments/test/test_environment.hh
@@ -89,7 +89,7 @@ namespace paludis
virtual const std::shared_ptr<const Mask> mask_for_user(const std::shared_ptr<const PackageID> &, const bool) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual bool unmasked_by_user(const std::shared_ptr<const PackageID> &) const
+ virtual bool unmasked_by_user(const std::shared_ptr<const PackageID> &, const std::string &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual std::shared_ptr<const FSPathSequence> hook_dirs() const