aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-01-21 17:00:58 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-01-21 16:20:09 +0000
commita492cbf5fd01559b0e6d5a823fccf58fa54e721a (patch)
treec41384684e117b556d020e8eb9e98425cb3121b7
parent6586b6cc8f63cb7fc32ee9bef0e98ad8822d87fd (diff)
downloadpaludis-a492cbf5fd01559b0e6d5a823fccf58fa54e721a.tar.gz
paludis-a492cbf5fd01559b0e6d5a823fccf58fa54e721a.tar.xz
Environments provide world now
-rw-r--r--paludis/environments/paludis/paludis_environment.cc2
-rw-r--r--paludis/environments/portage/portage_environment.cc8
-rw-r--r--paludis/environments/portage/portage_environment.hh3
3 files changed, 13 insertions, 0 deletions
diff --git a/paludis/environments/paludis/paludis_environment.cc b/paludis/environments/paludis/paludis_environment.cc
index e073adb..bf4d050 100644
--- a/paludis/environments/paludis/paludis_environment.cc
+++ b/paludis/environments/paludis/paludis_environment.cc
@@ -370,6 +370,8 @@ PaludisEnvironment::set_names() const
result->insert(SetName(strip_trailing_string(d->basename(), ".bash")));
}
+ result->insert(SetName("world"));
+
return result;
}
diff --git a/paludis/environments/portage/portage_environment.cc b/paludis/environments/portage/portage_environment.cc
index 0432d88..70da1c2 100644
--- a/paludis/environments/portage/portage_environment.cc
+++ b/paludis/environments/portage/portage_environment.cc
@@ -998,3 +998,11 @@ PortageEnvironment::config_location_key() const
return _imp->config_location_key;
}
+std::tr1::shared_ptr<const SetNameSet>
+PortageEnvironment::set_names() const
+{
+ std::tr1::shared_ptr<SetNameSet> result(new SetNameSet);
+ result->insert(SetName("world"));
+ return result;
+}
+
diff --git a/paludis/environments/portage/portage_environment.hh b/paludis/environments/portage/portage_environment.hh
index 5c49106..b5d1715 100644
--- a/paludis/environments/portage/portage_environment.hh
+++ b/paludis/environments/portage/portage_environment.hh
@@ -163,6 +163,9 @@ namespace paludis
virtual void remove_from_world(const SetName &) const;
+ virtual std::tr1::shared_ptr<const SetNameSet> set_names() const
+ PALUDIS_ATTRIBUTE((warn_unused_result));
+
virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > format_key() const;
virtual const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > config_location_key() const;
};