[buildd-tools-devel] [PATCH 11/11] Revert "facet_session: Move deserialisation code"

[Jan-Marek Glogowski]

Reverts 45364d48302ab5a4f3152159955c217306146a8c

Without this revert "schroot -l" deprecates the "source" keys
for union chroots.
---
 sbuild/sbuild-chroot-facet-session.cc |   37 ---------------------------------
 sbuild/sbuild-chroot-facet-source.cc  |   37 +++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/sbuild/sbuild-chroot-facet-session.cc b/sbuild/sbuild-chroot-facet-session.cc
index c404a96..782f7a2 100644
--- a/sbuild/sbuild-chroot-facet-session.cc
+++ b/sbuild/sbuild-chroot-facet-session.cc
@@ -169,41 +169,4 @@ chroot_facet_session::set_keyfile (chroot&        chroot,
 				   keyfile const& keyfile,
 				   string_list&   used_keys)
 {
-  // Null methods for obsolete keys.
-  void (sbuild::chroot_facet_session::* nullmethod)(bool) = 0;
-  void (sbuild::chroot_facet_session::* nullvmethod)(string_list const&) = 0;
-
-  // Setting when not clonable is deprecated.  It can't be obsoleted
-  // yet because it is required to allow use and ending of existing
-  // sessions which have set this parameter (even though it's
-  // useless).
-  keyfile::get_object_value(*this, nullmethod,
-			    keyfile, chroot.get_keyfile_name(),
-			    "active",
-			    keyfile::PRIORITY_DEPRECATED);
-  used_keys.push_back("active");
-
-  keyfile::get_object_list_value(*this, nullvmethod,
-				 keyfile, chroot.get_keyfile_name(),
-				 "source-users",
-				 keyfile::PRIORITY_DEPRECATED);
-  used_keys.push_back("source-users");
-
-  keyfile::get_object_list_value(*this, nullvmethod,
-				 keyfile, chroot.get_keyfile_name(),
-				 "source-groups",
-				 keyfile::PRIORITY_DEPRECATED);
-  used_keys.push_back("source-groups");
-
-  keyfile::get_object_list_value(*this, nullvmethod,
-				 keyfile, chroot.get_keyfile_name(),
-				 "source-root-users",
-				 keyfile::PRIORITY_DEPRECATED);
-  used_keys.push_back("source-root-users");
-
-  keyfile::get_object_list_value(*this, nullvmethod,
-				 keyfile, chroot.get_keyfile_name(),
-				 "source-root-groups",
-				 keyfile::PRIORITY_DEPRECATED);
-  used_keys.push_back("source-root-groups");
 }
diff --git a/sbuild/sbuild-chroot-facet-source.cc b/sbuild/sbuild-chroot-facet-source.cc
index 71c338c..0a46aa9 100644
--- a/sbuild/sbuild-chroot-facet-source.cc
+++ b/sbuild/sbuild-chroot-facet-source.cc
@@ -182,4 +182,41 @@ chroot_facet_source::set_keyfile (chroot&        chroot,
 				  keyfile const& keyfile,
 				  string_list&   used_keys)
 {
+  // Null methods for obsolete keys.
+  void (sbuild::chroot_facet_source::* nullmethod)(bool) = 0;
+  void (sbuild::chroot_facet_source::* nullvmethod)(string_list const&) = 0;
+
+  // Setting when not clonable is deprecated.  It can't be obsoleted
+  // yet because it is required to allow use and ending of existing
+  // sessions which have set this parameter (even though it's
+  // useless).
+  keyfile::get_object_value(*this, nullmethod,
+			    keyfile, chroot.get_keyfile_name(),
+			    "active",
+			    keyfile::PRIORITY_DEPRECATED);
+  used_keys.push_back("active");
+
+  keyfile::get_object_list_value(*this, nullvmethod,
+				 keyfile, chroot.get_keyfile_name(),
+				 "source-users",
+				 keyfile::PRIORITY_DEPRECATED);
+  used_keys.push_back("source-users");
+
+  keyfile::get_object_list_value(*this, nullvmethod,
+				 keyfile, chroot.get_keyfile_name(),
+				 "source-groups",
+				 keyfile::PRIORITY_DEPRECATED);
+  used_keys.push_back("source-groups");
+
+  keyfile::get_object_list_value(*this, nullvmethod,
+				 keyfile, chroot.get_keyfile_name(),
+				 "source-root-users",
+				 keyfile::PRIORITY_DEPRECATED);
+  used_keys.push_back("source-root-users");
+
+  keyfile::get_object_list_value(*this, nullvmethod,
+				 keyfile, chroot.get_keyfile_name(),
+				 "source-root-groups",
+				 keyfile::PRIORITY_DEPRECATED);
+  used_keys.push_back("source-root-groups");
 }
-- 
1.6.4