aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2007-02-09 09:41:04 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2007-02-09 09:41:04 +0000
commit8d1878ec91739acc79a45ea8bcd99ef6b10da1e9 (patch)
tree122b8240367722f698a4abeaa4fd8f3e49424f4e
parentd52c2131ab11a7f69b3ecb88e1d139a871222dc8 (diff)
downloadpaludis-8d1878ec91739acc79a45ea8bcd99ef6b10da1e9.tar.gz
paludis-8d1878ec91739acc79a45ea8bcd99ef6b10da1e9.tar.xz
Don't inherit info_pkgs and info_dirs from the master, to avoid clutter.
-rw-r--r--paludis/repositories/portage/portage_repository.cc22
1 files changed, 8 insertions, 14 deletions
diff --git a/paludis/repositories/portage/portage_repository.cc b/paludis/repositories/portage/portage_repository.cc
index 18b7de9..f03eae7 100644
--- a/paludis/repositories/portage/portage_repository.cc
+++ b/paludis/repositories/portage/portage_repository.cc
@@ -912,15 +912,12 @@ PortageRepository::info(bool verbose) const
s_end(result_non_verbose->end_sections()) ; s != s_end ; ++s)
result->add_section(*s);
+ // don't inherit from master_repository, just causes clutter
std::set<std::string> info_pkgs;
- for (std::list<FSEntry>::const_iterator p(_imp->profiles_dir_locations.begin()),
- p_end(_imp->profiles_dir_locations.end()) ; p != p_end ; ++p)
+ if ((_imp->params.location / "profiles" / "info_pkgs").exists())
{
- if ((*p / "info_pkgs").exists())
- {
- LineConfigFile vars(*p / "info_pkgs");
- info_pkgs.insert(vars.begin(), vars.end());
- }
+ LineConfigFile vars(_imp->params.location / "profiles" / "info_pkgs");
+ info_pkgs.insert(vars.begin(), vars.end());
}
if (! info_pkgs.empty())
@@ -951,15 +948,12 @@ PortageRepository::info(bool verbose) const
result->add_section(package_info);
}
+ // don't inherit from master_repository, just causes clutter
std::set<std::string> info_vars;
- for (std::list<FSEntry>::const_iterator p(_imp->profiles_dir_locations.begin()),
- p_end(_imp->profiles_dir_locations.end()) ; p != p_end ; ++p)
+ if ((_imp->params.location / "profiles" / "info_vars").exists())
{
- if ((*p / "info_vars").exists())
- {
- LineConfigFile vars(*p / "info_vars");
- info_vars.insert(vars.begin(), vars.end());
- }
+ LineConfigFile vars(_imp->params.location / "profiles" / "info_vars");
+ info_vars.insert(vars.begin(), vars.end());
}
if (! info_vars.empty() && ! info_pkgs.empty() &&