[sbuild] Rename chroot_plain_base to chroot_directory_base

7 files changed, 31 insertions, 53 deletions

diff --git a/sbuild/Makefile.am b/sbuild/Makefile.am
index efa2f78a..3235efe7 100644
--- a/sbuild/Makefile.am
+++ b/sbuild/Makefile.am
@@ -32,10 +32,10 @@ sbuild_public_h_sources =		\
 	sbuild-auth-null.h		\
 	sbuild-chroot.h			\
 	sbuild-chroot-directory.h	\
+	sbuild-chroot-directory-base.h	\
 	sbuild-chroot-file.h		\
 	sbuild-chroot-mountable.h	\
 	sbuild-chroot-plain.h		\
-	sbuild-chroot-plain-base.h	\
 	sbuild-chroot-source.h		\
 	sbuild-chroot-config.h		\
 	sbuild-chroot-union.h		\
@@ -103,10 +103,10 @@ sbuild_public_cc_sources =		\
 	sbuild-auth-null.cc		\
 	sbuild-chroot.cc		\
 	sbuild-chroot-directory.cc	\
+	sbuild-chroot-directory-base.cc	\
 	sbuild-chroot-file.cc		\
 	sbuild-chroot-mountable.cc	\
 	sbuild-chroot-plain.cc		\
-	sbuild-chroot-plain-base.cc	\
 	sbuild-chroot-source.cc		\
 	sbuild-chroot-config.cc		\
 	sbuild-ctty.cc			\
diff --git a/sbuild/sbuild-chroot-plain-base.cc b/sbuild/sbuild-chroot-directory-base.cc
index ea4a66e0..39802fc3 100644
--- a/sbuild/sbuild-chroot-plain-base.cc
+++ b/sbuild/sbuild-chroot-directory-base.cc
@@ -18,7 +18,7 @@
 
 #include <config.h>
 
-#include "sbuild-chroot-plain-base.h"
+#include "sbuild-chroot-directory-base.h"
 #include "sbuild-format-detail.h"
 #include "sbuild-lock.h"
 
@@ -31,23 +31,23 @@
 
 using namespace sbuild;
 
-chroot_plain_base::chroot_plain_base ():
+chroot_directory_base::chroot_directory_base ():
   chroot()
 {
 }
 
-chroot_plain_base::~chroot_plain_base ()
+chroot_directory_base::~chroot_directory_base ()
 {
 }
 
 std::string const&
-chroot_plain_base::get_directory () const
+chroot_directory_base::get_directory () const
 {
   return this->directory;
 }
 
 void
-chroot_plain_base::set_directory (std::string const& directory)
+chroot_directory_base::set_directory (std::string const& directory)
 {
   if (!is_absname(directory))
     throw chroot::error(directory, DIRECTORY_ABS);
@@ -56,7 +56,7 @@ chroot_plain_base::set_directory (std::string const& directory)
 }
 
 void
-chroot_plain_base::setup_env (environment& env)
+chroot_directory_base::setup_env (environment& env)
 {
   chroot::setup_env(env);
 
@@ -64,21 +64,7 @@ chroot_plain_base::setup_env (environment& env)
 }
 
 void
-chroot_plain_base::setup_lock (chroot::setup_type type,
-			       bool               lock,
-			       int                status)
-{
-  /* By default, plain_base chroots do no locking. */
-}
-
-sbuild::chroot::session_flags
-chroot_plain_base::get_session_flags () const
-{
-  return SESSION_NOFLAGS;
-}
-
-void
-chroot_plain_base::get_details (format_detail& detail) const
+chroot_directory_base::get_details (format_detail& detail) const
 {
   chroot::get_details(detail);
 
@@ -86,17 +72,17 @@ chroot_plain_base::get_details (format_detail& detail) const
 }
 
 void
-chroot_plain_base::get_keyfile (keyfile& keyfile) const
+chroot_directory_base::get_keyfile (keyfile& keyfile) const
 {
   chroot::get_keyfile(keyfile);
 
-  keyfile::set_object_value(*this, &chroot_plain_base::get_directory,
+  keyfile::set_object_value(*this, &chroot_directory_base::get_directory,
 			    keyfile, get_keyfile_name(), "directory");
 }
 
 void
-chroot_plain_base::set_keyfile (keyfile const& keyfile,
-				string_list&   used_keys)
+chroot_directory_base::set_keyfile (keyfile const& keyfile,
+				    string_list&   used_keys)
 {
   chroot::set_keyfile(keyfile, used_keys);
 
@@ -119,12 +105,12 @@ chroot_plain_base::set_keyfile (keyfile const& keyfile,
   if (directory_key && location_key)
     location_priority = keyfile::PRIORITY_DISALLOWED;
 
-  keyfile::get_object_value(*this, &chroot_plain_base::set_directory,
+  keyfile::get_object_value(*this, &chroot_directory_base::set_directory,
 			    keyfile, get_keyfile_name(), "directory",
 			    directory_priority);
   used_keys.push_back("directory");
 
-  keyfile::get_object_value(*this, &chroot_plain_base::set_directory,
+  keyfile::get_object_value(*this, &chroot_directory_base::set_directory,
 			    keyfile, get_keyfile_name(), "location",
 			    location_priority);
   used_keys.push_back("location");
diff --git a/sbuild/sbuild-chroot-plain-base.h b/sbuild/sbuild-chroot-directory-base.h
index 86f92a75..93f25241 100644
--- a/sbuild/sbuild-chroot-plain-base.h
+++ b/sbuild/sbuild-chroot-directory-base.h
@@ -16,8 +16,8 @@
  *
  *********************************************************************/
 
-#ifndef SBUILD_CHROOT_PLAIN_BASE_H
-#define SBUILD_CHROOT_PLAIN_BASE_H
+#ifndef SBUILD_CHROOT_DIRECTORY_BASE_H
+#define SBUILD_CHROOT_DIRECTORY_BASE_H
 
 #include <sbuild/sbuild-chroot.h>
 
@@ -27,17 +27,17 @@ namespace sbuild
   /**
    * A chroot located in the filesystem (mounts disabled).
    */
-  class chroot_plain_base : virtual public chroot
+  class chroot_directory_base : virtual public chroot
   {
   protected:
     /// The constructor.
-    chroot_plain_base ();
+    chroot_directory_base ();
 
     friend class chroot;
 
   public:
     /// The destructor.
-    virtual ~chroot_plain_base ();
+    virtual ~chroot_directory_base ();
 
     /**
      * Get the directory containing the chroot.
@@ -58,16 +58,8 @@ namespace sbuild
     virtual void
     setup_env (environment& env);
 
-    virtual session_flags
-    get_session_flags () const;
-
   protected:
     virtual void
-    setup_lock (chroot::setup_type type,
-		bool               lock,
-		int                status);
-
-    virtual void
     get_details (format_detail& detail) const;
 
     virtual void
@@ -84,7 +76,7 @@ namespace sbuild
 
 }
 
-#endif /* SBUILD_CHROOT_PLAIN_BASE_H */
+#endif /* SBUILD_CHROOT_DIRECTORY_BASE_H */
 
 /*
  * Local Variables:
diff --git a/sbuild/sbuild-chroot-directory.cc b/sbuild/sbuild-chroot-directory.cc
index 2c0d3f26..8a204595 100644
--- a/sbuild/sbuild-chroot-directory.cc
+++ b/sbuild/sbuild-chroot-directory.cc
@@ -32,7 +32,7 @@
 using namespace sbuild;
 
 chroot_directory::chroot_directory ():
-  chroot_plain_base()
+  chroot_directory_base()
 #ifdef SBUILD_FEATURE_UNION
   , chroot_union()
 #endif // SBUILD_FEATURE_UNION
@@ -74,7 +74,7 @@ chroot_directory::get_path () const
 void
 chroot_directory::setup_env (environment& env)
 {
-  chroot_plain_base::setup_env(env);
+  chroot_directory_base::setup_env(env);
 #ifdef SBUILD_FEATURE_UNION
   chroot_union::setup_env(env);
 #endif // SBUILD_FEATURE_UNION
@@ -115,7 +115,7 @@ chroot_directory::get_session_flags () const
 void
 chroot_directory::get_details (format_detail& detail) const
 {
-  chroot_plain_base::get_details(detail);
+  chroot_directory_base::get_details(detail);
 #ifdef SBUILD_FEATURE_UNION
   chroot_union::get_details(detail);
 #endif // SBUILD_FEATURE_UNION
@@ -124,7 +124,7 @@ chroot_directory::get_details (format_detail& detail) const
 void
 chroot_directory::get_keyfile (keyfile& keyfile) const
 {
-  chroot_plain_base::get_keyfile(keyfile);
+  chroot_directory_base::get_keyfile(keyfile);
 #ifdef SBUILD_FEATURE_UNION
   chroot_union::get_keyfile(keyfile);
 #endif // SBUILD_FEATURE_UNION
@@ -134,7 +134,7 @@ void
 chroot_directory::set_keyfile (keyfile const& keyfile,
 			      string_list&   used_keys)
 {
-  chroot_plain_base::set_keyfile(keyfile, used_keys);
+  chroot_directory_base::set_keyfile(keyfile, used_keys);
 #ifdef SBUILD_FEATURE_UNION
   chroot_union::set_keyfile(keyfile, used_keys);
 #endif // SBUILD_FEATURE_UNION
diff --git a/sbuild/sbuild-chroot-directory.h b/sbuild/sbuild-chroot-directory.h
index 0ac34bb9..e223e626 100644
--- a/sbuild/sbuild-chroot-directory.h
+++ b/sbuild/sbuild-chroot-directory.h
@@ -20,7 +20,7 @@
 #define SBUILD_CHROOT_DIRECTORY_H
 
 #include <sbuild/sbuild-config.h>
-#include <sbuild/sbuild-chroot-plain-base.h>
+#include <sbuild/sbuild-chroot-directory-base.h>
 #ifdef SBUILD_FEATURE_UNION
 #include <sbuild/sbuild-chroot-union.h>
 #endif // SBUILD_FEATURE_UNION
@@ -31,7 +31,7 @@ namespace sbuild
   /**
    * A chroot located in the filesystem.
    */
-  class chroot_directory : public chroot_plain_base
+  class chroot_directory : public chroot_directory_base
 #ifdef SBUILD_FEATURE_UNION
 			 , public chroot_union
 #endif // SBUILD_FEATURE_UNION
diff --git a/sbuild/sbuild-chroot-plain.cc b/sbuild/sbuild-chroot-plain.cc
index 28033051..2a3f2bcc 100644
--- a/sbuild/sbuild-chroot-plain.cc
+++ b/sbuild/sbuild-chroot-plain.cc
@@ -32,7 +32,7 @@
 using namespace sbuild;
 
 chroot_plain::chroot_plain ():
-  chroot()
+  chroot_directory_base()
 {
   set_run_setup_scripts(false);
 }
diff --git a/sbuild/sbuild-chroot-plain.h b/sbuild/sbuild-chroot-plain.h
index 9f75d470..5ac4b53c 100644
--- a/sbuild/sbuild-chroot-plain.h
+++ b/sbuild/sbuild-chroot-plain.h
@@ -19,7 +19,7 @@
 #ifndef SBUILD_CHROOT_PLAIN_H
 #define SBUILD_CHROOT_PLAIN_H
 
-#include <sbuild/sbuild-chroot-plain-base.h>
+#include <sbuild/sbuild-chroot-directory-base.h>
 
 namespace sbuild
 {
@@ -27,7 +27,7 @@ namespace sbuild
   /**
    * A chroot located in the filesystem (mounts disabled).
    */
-  class chroot_plain : virtual public chroot_plain_base
+  class chroot_plain : virtual public chroot_directory_base
   {
   protected:
     /// The constructor.