From 967758b8667d651f9b64acc1aeb207e9d4fad737 Mon Sep 17 00:00:00 2001
From: Zhang Qiang <qiang.z.zhang@intel.com>
Date: Thu, 16 May 2013 10:18:47 +0800
Subject: [PATCH] refine createimage to return None zero if failed

Change-Id: Idf0ba080fb2c32ec5f0ece3c35021fbe84399c90
---
 gitbuildsys/cmd_createimage.py | 16 ++++++++++------
 tools/gbs                      | 11 +++++++----
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/gitbuildsys/cmd_createimage.py b/gitbuildsys/cmd_createimage.py
index a88301d..f7fa60c 100644
--- a/gitbuildsys/cmd_createimage.py
+++ b/gitbuildsys/cmd_createimage.py
@@ -34,13 +34,17 @@ def createimage(args, ks_file):
     extra_mic_opts += ['--record-pkgs=name']
     mic_cmd = 'sudo mic create auto %s %s' % (ks_file, ' '.join(extra_mic_opts))
     log.debug(mic_cmd)
-    os.system(mic_cmd)
+    return os.system(mic_cmd)
 
 def main(args):
     '''main entrance for createimage'''
 
-    if args.ks_file:
-        if not os.path.exists(args.ks_file):
-            raise GbsError('specified ks file %s does not exist' % args.ks_file)
-        log.info('creating image for ks file: %s' % args.ks_file)
-        createimage(args, args.ks_file)
+    if not os.path.exists(args.ks_file):
+        raise GbsError('specified ks file %s does not exist' % args.ks_file)
+
+    log.info('creating image for ks file: %s' % args.ks_file)
+    retcode = createimage(args, args.ks_file)
+    if retcode != 0:
+        raise GbsError('failed to create image')
+    else:
+        log.info('Done')
diff --git a/tools/gbs b/tools/gbs
index 823c292..162c4a4 100755
--- a/tools/gbs
+++ b/tools/gbs
@@ -263,10 +263,13 @@ def build_parser(parser):
 
 @subparser
 def createimage_parser(parser):
-    """create image using ks file """
-
-    parser.add_argument('-K', '--ks-file',
-                        help='ks file to be used')
+    """create image using ks file
+    Examples:
+      $ gbs createimage --ks-file=path/to/ks-file
+      $ gbs createimage --ks-file=path/to/ks-file --tmpfs
+    """
+    parser.add_argument('-K', '--ks-file', required=True,
+                        help='ks file to be used for image creation')
     parser.add_argument('-O', '--outdir',
                         help='image output directory')
     parser.add_argument('--tmpfs', action='store_true',
-- 
2.7.4