Merge branch 'baserock/adamcoldrick/remove-dependencies-v3'

This stops the deployment extensions from depending on morphlib
and cliapp, as well as setting the definitions version to 5.

Reviewed-by: Sam Thursfield <sam.thursfield@codethink.co.uk>
Reviewed-by: Paul Sherwood <paul.sherwood@codethink.co.uk>

1 files changed, 9 insertions, 9 deletions

diff --git a/extensions/jffs2.write b/extensions/jffs2.write
index 46b69a53..ad68204d 100644
--- a/extensions/jffs2.write
+++ b/extensions/jffs2.write
@@ -19,34 +19,34 @@
    as the root filesystem.'''
 
 
-import cliapp
 import os
+import subprocess
 
-import morphlib.writeexts
+import writeexts
 
 
-class Jffs2WriteExtension(morphlib.writeexts.WriteExtension):
+class Jffs2WriteExtension(writeexts.WriteExtension):
 
     '''See jffs2.write.help for documentation.'''
 
     def process_args(self, args):
         if len(args) != 2:
-            raise cliapp.AppException('Wrong number of command line args')
+            raise writeexts.ExtensionError('Wrong number of command line args')
 
         temp_root, location = args
 
         try:
             self.create_jffs2_system(temp_root, location)
             self.status(msg='Disk image has been created at %(location)s',
-                        location = location)
+                        location=location)
         except Exception:
             self.status(msg='Failure to deploy system to %(location)s',
-                        location = location)
+                        location=location)
             raise
 
     def create_jffs2_system(self, temp_root, location):
         erase_block = self.get_erase_block_size()
-        cliapp.runcmd(
+        subprocess.check_call(
             ['mkfs.jffs2', '--pad', '--no-cleanmarkers',
              '--eraseblock='+erase_block, '-d', temp_root, '-o', location])
 
@@ -54,10 +54,10 @@ class Jffs2WriteExtension(morphlib.writeexts.WriteExtension):
         erase_block = os.environ.get('ERASE_BLOCK', '')
 
         if erase_block == '':
-            raise cliapp.AppException('ERASE_BLOCK was not given')
+            raise writeexts.ExtensionError('ERASE_BLOCK was not given')
 
         if not erase_block.isdigit():
-            raise cliapp.AppException('ERASE_BLOCK must be a whole number')
+            raise writeexts.ExtensionError('ERASE_BLOCK must be a whole number')
 
         return erase_block