[buildd-tools-devel] [PATCH 12/12] [sbuild::chroot] Don't write 'active' key

[Jan-Marek Glogowski]

The key is already deprecated so don't write it to new session
keyfiles.
---
 sbuild/sbuild-chroot.cc            |    4 ----
 test/sbuild-chroot-block-device.cc |    3 ---
 test/sbuild-chroot-directory.cc    |    3 ---
 test/sbuild-chroot-file.cc         |    2 --
 test/sbuild-chroot-loopback.cc     |    3 ---
 test/sbuild-chroot-lvm-snapshot.cc |    3 ---
 test/sbuild-chroot-plain.cc        |    1 -
 test/sbuild-chroot.cc              |    1 -
 test/test-sbuild-chroot.h          |    3 ---
 9 files changed, 0 insertions(+), 23 deletions(-)

diff --git a/sbuild/sbuild-chroot.cc b/sbuild/sbuild-chroot.cc
index 6fc2d43..dc3839e 100644
--- a/sbuild/sbuild-chroot.cc
+++ b/sbuild/sbuild-chroot.cc
@@ -616,10 +616,6 @@ sbuild::chroot::get_keyfile (chroot const& chroot,
 			    keyfile, chroot.get_keyfile_name(),
 			    "type");
 
-  keyfile::set_object_value(chroot, &chroot::get_active,
-			    keyfile, chroot.get_keyfile_name(),
-			    "active");
-
   keyfile::set_object_value(chroot, &chroot::get_script_config,
 			    keyfile, chroot.get_keyfile_name(),
 			    "script-config");
diff --git a/test/sbuild-chroot-block-device.cc b/test/sbuild-chroot-block-device.cc
index 01a1799..9e86e44 100644
--- a/test/sbuild-chroot-block-device.cc
+++ b/test/sbuild-chroot-block-device.cc
@@ -208,7 +208,6 @@ public:
     sbuild::keyfile expected;
     std::string group = chroot->get_name();
     setup_keyfile_chroot(expected, group);
-    expected.set_value(group, "active", "false");
     expected.set_value(group, "type", "block-device");
     expected.set_value(group, "device", "/dev/testdev");
     expected.set_value(group, "location", "/squeeze");
@@ -227,7 +226,6 @@ public:
     setup_keyfile_union_configured(expected, group);
     setup_keyfile_chroot(expected, group);
     setup_keyfile_source(expected, group);
-    expected.set_value(group, "active", "false");
     expected.set_value(group, "type", "block-device");
     expected.set_value(group, "device", "/dev/testdev");
     expected.set_value(group, "location", "/squeeze");
@@ -261,7 +259,6 @@ public:
     const std::string group(source_union->get_name());
     setup_keyfile_chroot(expected, group);
     setup_keyfile_source_clone(expected, group);
-    expected.set_value(group, "active", "false");
     expected.set_value(group, "type", "block-device");
     expected.set_value(group, "description", chroot->get_description() + ' ' + _("(source chroot)"));
     expected.set_value(group, "device", "/dev/testdev");
diff --git a/test/sbuild-chroot-directory.cc b/test/sbuild-chroot-directory.cc
index cd2fa8d..c8c7892 100644
--- a/test/sbuild-chroot-directory.cc
+++ b/test/sbuild-chroot-directory.cc
@@ -188,7 +188,6 @@ public:
     sbuild::keyfile expected;
     const std::string group(chroot->get_name());
     setup_keyfile_chroot(expected, group);
-    expected.set_value(group, "active", "false");
     expected.set_value(group, "type", "directory");
     expected.set_value(group, "directory", "/srv/chroot/example-chroot");
     setup_keyfile_union_unconfigured(expected, group);
@@ -204,7 +203,6 @@ public:
     const std::string group(chroot_union->get_name());
     setup_keyfile_chroot(expected, group);
     setup_keyfile_source(expected, group);
-    expected.set_value(group, "active", "false");
     expected.set_value(group, "type", "directory");
     expected.set_value(group, "directory", "/srv/chroot/example-chroot");
     setup_keyfile_union_configured(expected, group);
@@ -235,7 +233,6 @@ public:
     const std::string group(source_union->get_name());
     setup_keyfile_chroot(expected, group);
     setup_keyfile_source_clone(expected, group);
-    expected.set_value(group, "active", "false");
     expected.set_value(group, "type", "directory");
     expected.set_value(group, "description", chroot->get_description() + ' ' + _("(source chroot)"));
     expected.set_value(group, "directory", "/srv/chroot/example-chroot");
diff --git a/test/sbuild-chroot-file.cc b/test/sbuild-chroot-file.cc
index c3188dd..6fec146 100644
--- a/test/sbuild-chroot-file.cc
+++ b/test/sbuild-chroot-file.cc
@@ -173,7 +173,6 @@ public:
     const std::string group(chroot->get_name());
     setup_keyfile_chroot(expected, group);
     setup_keyfile_source(expected, group);
-    expected.set_value(group, "active", "false");
     expected.set_value(group, "type", "file");
     expected.set_value(group, "file", "/srv/chroot/example.tar.bz2");
 
@@ -203,7 +202,6 @@ public:
     const std::string group(source->get_name());
     setup_keyfile_chroot(expected, group);
     setup_keyfile_source_clone(expected, group);
-    expected.set_value(group, "active", "false");
     expected.set_value(group, "type", "file");
     expected.set_value(group, "description", chroot->get_description() + ' ' + _("(source chroot)"));
     expected.set_value(group, "file", "/srv/chroot/example.tar.bz2");
diff --git a/test/sbuild-chroot-loopback.cc b/test/sbuild-chroot-loopback.cc
index 3525953..de21d64 100644
--- a/test/sbuild-chroot-loopback.cc
+++ b/test/sbuild-chroot-loopback.cc
@@ -205,7 +205,6 @@ public:
     sbuild::keyfile expected;
     const std::string group(chroot->get_name());
     setup_keyfile_chroot(expected, group);
-    expected.set_value(group, "active", "false");
     expected.set_value(group, "type", "loopback");
     expected.set_value(group, "file", loopback_file);
     expected.set_value(group, "location", "/squeeze");
@@ -223,7 +222,6 @@ public:
     const std::string group(chroot_union->get_name());
     setup_keyfile_chroot(expected, group);
     setup_keyfile_source(expected, group);
-    expected.set_value(group, "active", "false");
     expected.set_value(group, "type", "loopback");
     expected.set_value(group, "file", loopback_file);
     expected.set_value(group, "location", "/squeeze");
@@ -258,7 +256,6 @@ public:
     const std::string group(source_union->get_name());
     setup_keyfile_chroot(expected, group);
     setup_keyfile_source_clone(expected, group);
-    expected.set_value(group, "active", "false");
     expected.set_value(group, "type", "loopback");
     expected.set_value(group, "description", chroot->get_description() + ' ' + _("(source chroot)"));
     expected.set_value(group, "file", loopback_file);
diff --git a/test/sbuild-chroot-lvm-snapshot.cc b/test/sbuild-chroot-lvm-snapshot.cc
index bbcefd9..95cd2fd 100644
--- a/test/sbuild-chroot-lvm-snapshot.cc
+++ b/test/sbuild-chroot-lvm-snapshot.cc
@@ -189,7 +189,6 @@ public:
     std::string group = chroot->get_name();
     setup_keyfile_chroot(expected, group);
     setup_keyfile_source(expected, group);
-    expected.set_value(group, "active", "false");
     expected.set_value(group, "type", "lvm-snapshot");
     expected.set_value(group, "device", "/dev/volgroup/testdev");
     expected.set_value(group, "location", "/squeeze");
@@ -205,7 +204,6 @@ public:
     sbuild::keyfile expected;
     const std::string group(session->get_name());
     setup_keyfile_chroot(expected, group);
-    expected.set_value(group, "active", "true");
     expected.set_value(group, "type", "lvm-snapshot");
     expected.set_value(group, "name", "test-session-name");
     expected.set_value(group, "description", chroot->get_description() + ' ' + _("(session chroot)"));
@@ -225,7 +223,6 @@ public:
     sbuild::keyfile expected;
     const std::string group(source->get_name());
     setup_keyfile_chroot(expected, group);
-    expected.set_value(group, "active", "false");
     expected.set_value(group, "type", "block-device");
     expected.set_value(group, "description", chroot->get_description() + ' ' + _("(source chroot)"));
     expected.set_value(group, "aliases", "test-alias-1-source,test-alias-2-source");
diff --git a/test/sbuild-chroot-plain.cc b/test/sbuild-chroot-plain.cc
index 10335bb..0fa7e34 100644
--- a/test/sbuild-chroot-plain.cc
+++ b/test/sbuild-chroot-plain.cc
@@ -114,7 +114,6 @@ public:
     sbuild::keyfile expected;
     std::string group = chroot->get_name();
     setup_keyfile_chroot(expected, group);
-    expected.set_value(group, "active", "false");
     expected.set_value(group, "type", "plain");
     expected.set_value(group, "directory", "/srv/chroot/example-chroot");
 
diff --git a/test/sbuild-chroot.cc b/test/sbuild-chroot.cc
index d4e2712..6fdea1d 100644
--- a/test/sbuild-chroot.cc
+++ b/test/sbuild-chroot.cc
@@ -240,7 +240,6 @@ public:
     sbuild::keyfile expected;
     std::string group = chroot->get_name();
     setup_keyfile_chroot(expected, group);
-    expected.set_value(group, "active", "false");
     expected.set_value(group, "type", "test");
 
     test_chroot_base<basic_chroot>::test_setup_keyfile
diff --git a/test/test-sbuild-chroot.h b/test/test-sbuild-chroot.h
index 0b8043a..65981f5 100644
--- a/test/test-sbuild-chroot.h
+++ b/test/test-sbuild-chroot.h
@@ -166,7 +166,6 @@ public:
   void setup_keyfile_chroot (sbuild::keyfile&   keyfile,
 			     std::string const& group)
   {
-    keyfile.set_value(group, "active", "false");
     keyfile.set_value(group, "description", "test-description");
     keyfile.set_value(group, "priority", "3");
     keyfile.set_value(group, "aliases", "test-alias-1,test-alias-2");
@@ -214,7 +213,6 @@ public:
   void setup_keyfile_session_clone (sbuild::keyfile&   keyfile,
 				    std::string const& group)
   {
-    keyfile.set_value(group, "active", "true");
     keyfile.set_value(group, "description", chroot->get_description() + ' ' + _("(session chroot)"));
     keyfile.set_value(group, "aliases", "");
   }
@@ -231,7 +229,6 @@ public:
   void setup_keyfile_source_clone (sbuild::keyfile&   keyfile,
 				   std::string const& group)
   {
-    keyfile.set_value(group, "active", "false");
     keyfile.set_value(group, "description", chroot->get_description() + ' ' + _("(source chroot)"));
     keyfile.set_value(group, "users", "suser1,suser2");
     keyfile.set_value(group, "root-users", "suser3,suser4");
-- 
1.6.3.2