[buildd-tools-devel] [PATCH 3/6] Drop facet-source-clonable data from sessions.

[Jan-Marek Glogowski]

This is not useable by sessions, as it's just used to when creating
a source chroot session, to override the non-source users and groups.
---
 debian/changelog                              |    3 ++-
 sbuild/sbuild-chroot-facet-source-clonable.cc |    9 +++++++++
 2 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3f9e82a..6bc21d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ schroot (1.4.24-1) unstable; urgency=low
     - Drop date classes from sbuild-types.h.
     - Drop sbuild-types.c.
     - Convert code to use Boost.Date_Time for all dates.
+  * Don't include facet-source-clonable data in sessions.
 
- -- Jan-Marek Glogowski <jan-marek.glogowski at muenchen.de>  Thu, 23 Jun 2011 15:07:46 +0200
+ -- Jan-Marek Glogowski <jan-marek.glogowski at muenchen.de>  Thu, 23 Jun 2011 15:31:19 +0200
 
 schroot (1.4.23-1) unstable; urgency=low
 
diff --git a/sbuild/sbuild-chroot-facet-source-clonable.cc b/sbuild/sbuild-chroot-facet-source-clonable.cc
index fcb372d..c50eb33 100644
--- a/sbuild/sbuild-chroot-facet-source-clonable.cc
+++ b/sbuild/sbuild-chroot-facet-source-clonable.cc
@@ -159,6 +159,9 @@ void
 chroot_facet_source_clonable::get_details (chroot const&  chroot,
 					   format_detail& detail) const
 {
+  if (chroot.get_facet<chroot_facet_session>())
+    return;
+
   detail
     .add(_("Source Users"), get_source_users())
     .add(_("Source Groups"), get_source_groups())
@@ -170,6 +173,9 @@ void
 chroot_facet_source_clonable::get_keyfile (chroot const& chroot,
 					   keyfile&      keyfile) const
 {
+  if (chroot.get_facet<chroot_facet_session>())
+    return;
+
   keyfile::set_object_value(*this, &chroot_facet_source_clonable::get_source_clone,
 			    keyfile, chroot.get_name(),
 			    "source-clone");
@@ -196,6 +202,9 @@ chroot_facet_source_clonable::set_keyfile (chroot&        chroot,
 					   keyfile const& keyfile,
 					   string_list&   used_keys)
 {
+  if (chroot.get_facet<chroot_facet_session>())
+    return;
+
   keyfile::get_object_value(*this, &chroot_facet_source_clonable::set_source_clone,
 			    keyfile, chroot.get_name(),
 			    "source-clone",
-- 
1.7.2.5