diff options
| author | Roger Leigh <rleigh@debian.org> | 2013-05-04 18:36:30 +0100 |
|---|---|---|
| committer | Roger Leigh <rleigh@debian.org> | 2013-05-04 18:37:01 +0100 |
| commit | a0b402b32562454c1fa1e0a33908e51c2514ca6b (patch) | |
| tree | b4289ffec75495010d2cfd0f9bbd7a842c648687 /lib | |
| parent | 0e529a5253b4413ff22d8cbaf3f1d649967022fb (diff) | |
| download | schroot-a0b402b32562454c1fa1e0a33908e51c2514ca6b.tar.gz | |
sbuild::chroot: Remove obsolete keys
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sbuild/chroot/chroot.cc | 34 | ||||
| -rw-r--r-- | lib/sbuild/chroot/facet/session.cc | 33 |
2 files changed, 0 insertions, 67 deletions
diff --git a/lib/sbuild/chroot/chroot.cc b/lib/sbuild/chroot/chroot.cc index a14f3420..af5f25f0 100644 --- a/lib/sbuild/chroot/chroot.cc +++ b/lib/sbuild/chroot/chroot.cc @@ -768,35 +768,8 @@ namespace sbuild void chroot::set_keyfile (keyfile const& keyfile) { - // Null method for obsolete keys. - void (chroot::* nullmethod)(bool) = 0; - bool session = static_cast<bool>(get_facet<facet::session>()); - keyfile::get_object_value(*this, nullmethod, - keyfile, get_name(), - "active", - keyfile::PRIORITY_OBSOLETE); - - // Setup scripts are run depending on the chroot type in use, and is - // no longer user-configurable. They need to run for all types - // except "plain". - keyfile::get_object_value(*this, nullmethod, - keyfile, get_name(), - "run-setup-scripts", - keyfile::PRIORITY_OBSOLETE); - - // Exec scripts have been removed, so these two calls do nothing - // except to warn the user that the options are no longer used. - keyfile::get_object_value(*this, nullmethod, - keyfile, get_name(), - "run-session-scripts", - keyfile::PRIORITY_OBSOLETE); - keyfile::get_object_value(*this, nullmethod, - keyfile, get_name(), - "run-exec-scripts", - keyfile::PRIORITY_OBSOLETE); - keyfile::get_object_value(*this, &chroot::set_profile, keyfile, get_name(), "profile", @@ -809,13 +782,6 @@ namespace sbuild keyfile::PRIORITY_OPTIONAL : keyfile::PRIORITY_DEPRECATED); - keyfile::get_object_value(*this, nullmethod, - keyfile, get_name(), - "priority", - session ? - keyfile::PRIORITY_OPTIONAL : - keyfile::PRIORITY_OBSOLETE); - keyfile::get_object_list_value(*this, &chroot::set_aliases, keyfile, get_name(), "aliases", diff --git a/lib/sbuild/chroot/facet/session.cc b/lib/sbuild/chroot/facet/session.cc index f6a7f6a4..75070c58 100644 --- a/lib/sbuild/chroot/facet/session.cc +++ b/lib/sbuild/chroot/facet/session.cc @@ -223,39 +223,6 @@ namespace sbuild session::set_keyfile (chroot& chroot, keyfile const& keyfile) { - // Null methods for obsolete keys. - void (session::* nullmethod)(bool) = 0; - void (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_name(), - "active", - keyfile::PRIORITY_OBSOLETE); - - keyfile::get_object_list_value(*this, nullvmethod, - keyfile, chroot.get_name(), - "source-users", - keyfile::PRIORITY_OBSOLETE); - - keyfile::get_object_list_value(*this, nullvmethod, - keyfile, chroot.get_name(), - "source-groups", - keyfile::PRIORITY_OBSOLETE); - - keyfile::get_object_list_value(*this, nullvmethod, - keyfile, chroot.get_name(), - "source-root-users", - keyfile::PRIORITY_OBSOLETE); - - keyfile::get_object_list_value(*this, nullvmethod, - keyfile, chroot.get_name(), - "source-root-groups", - keyfile::PRIORITY_OBSOLETE); - keyfile::get_object_value(*this, &session::set_original_name, keyfile, chroot.get_name(), "original-name", |