From dfd293b6e80566e441d0c3a565078797e2babf5d Mon Sep 17 00:00:00 2001 From: Zhang Qiang Date: Thu, 16 May 2013 15:30:33 +0800 Subject: [PATCH] don't install mic on centos and give error if mic does not exist Currently, CentOS has not been supportted by mic, so user have to install mic manually on CentOS Change-Id: I9f245b34b6dcb1f6df1f7b7565fb3efa16b50b82 --- gitbuildsys/cmd_createimage.py | 4 ++++ packaging/gbs.spec | 2 ++ 2 files changed, 6 insertions(+) diff --git a/gitbuildsys/cmd_createimage.py b/gitbuildsys/cmd_createimage.py index f7fa60c..64cdb4e 100644 --- a/gitbuildsys/cmd_createimage.py +++ b/gitbuildsys/cmd_createimage.py @@ -38,6 +38,10 @@ def createimage(args, ks_file): def main(args): '''main entrance for createimage''' + try: + import mic + except ImportError: + raise GbsError('please install mic manually first') if not os.path.exists(args.ks_file): raise GbsError('specified ks file %s does not exist' % args.ks_file) diff --git a/packaging/gbs.spec b/packaging/gbs.spec index 9e5f777..67985da 100644 --- a/packaging/gbs.spec +++ b/packaging/gbs.spec @@ -15,7 +15,9 @@ Requires: sudo Requires: osc >= 0.139.0 Requires: tizen-gbp-rpm >= 20130403 Requires: depanneur >= 0.7 +%if ! 0%{?centos_version:1} Requires: mic >= 0.18 +%endif %if "%{?python_version}" < "2.7" Requires: python-argparse -- 2.7.4