Rename diagnose to inspect

diff --git a/image_creator/image.py b/image_creator/image.py
index bbc53ae..aebd2c9 100644 (file)
--- a/image_creator/image.py
+++ b/image_creator/image.py
@@ -115,8 +115,8 @@ class Image(object):
             'found a(n) %s system' %
             self.ostype if self.distro == "unknown" else self.distro)
 
             'found a(n) %s system' %
             self.ostype if self.distro == "unknown" else self.distro)
 

-        # Run OS-specific diagnostics
-        self.os.diagnose()
+        # Inspect the OS
+        self.os.inspect()

 
     def set_unsupported(self, reason):
         """Flag this image us ansupported"""
 
     def set_unsupported(self, reason):
         """Flag this image us ansupported"""

diff --git a/image_creator/os_type/__init__.py b/image_creator/os_type/__init__.py
index 63b7f5a..c8c1620 100644 (file)
--- a/image_creator/os_type/__init__.py
+++ b/image_creator/os_type/__init__.py
@@ -144,17 +144,17 @@ class OSBase(object):
         except RuntimeError:
             self._scrub_support = False
 
         except RuntimeError:
             self._scrub_support = False
 

-    def diagnose(self):
-        """Run diagnostics to check if the media is supported"""
+    def inspect(self):
+        """Inspect the media to if it is supported"""

 
         if self.image.is_unsupported():
             return
 
 
         if self.image.is_unsupported():
             return
 

-        self.out.output('Running OS diagnostics:')
+        self.out.output('Running OS inspection:')

         try:
             if not self.mount(readonly=True):
                 raise FatalError("Unable to mount the media read-only")
         try:
             if not self.mount(readonly=True):
                 raise FatalError("Unable to mount the media read-only")

-            self._do_diagnose()
+            self._do_inspect()

         finally:
             self.umount()
 
         finally:
             self.umount()
 

@@ -372,8 +372,8 @@ class OSBase(object):
             if has_ftype(f, ftype):
                 action(full_path)
 
             if has_ftype(f, ftype):
                 action(full_path)
 

-    def _do_diagnose(self):
-        """helper method for diagnose"""
+    def _do_inspect(self):
+        """helper method for inspect"""

         pass
 
     def _do_collect_metadata(self):
         pass
 
     def _do_collect_metadata(self):

diff --git a/image_creator/os_type/freebsd.py b/image_creator/os_type/freebsd.py
index 8ee5427..145be3e 100644 (file)
--- a/image_creator/os_type/freebsd.py
+++ b/image_creator/os_type/freebsd.py
@@ -82,7 +82,7 @@ class Freebsd(Unix):
             self.out.warn("No passworded users found!")
             del self.meta['USERS']
 
             self.out.warn("No passworded users found!")
             del self.meta['USERS']
 

-    def _do_diagnose(self):
+    def _do_inspect(self):

         """Run various diagnostics to check if media is supported"""
 
         self.out.output('Checking partition table type...', False)
         """Run various diagnostics to check if media is supported"""
 
         self.out.output('Checking partition table type...', False)

diff --git a/image_creator/os_type/linux.py b/image_creator/os_type/linux.py
index d0ca04a..f320519 100644 (file)
--- a/image_creator/os_type/linux.py
+++ b/image_creator/os_type/linux.py
@@ -298,7 +298,7 @@ class Linux(Unix):
 
         return orig, dev, mpoint
 
 
         return orig, dev, mpoint
 

-    def _do_diagnose(self):
+    def _do_inspect(self):

         """Run various diagnostics to check if media is supported"""
 
         self.out.output(
         """Run various diagnostics to check if media is supported"""
 
         self.out.output(