From 36fe48db5210b453c8837605850ca1f71b18e2c7 Mon Sep 17 00:00:00 2001 From: JF Ding Date: Mon, 2 Jan 2012 17:08:23 +0800 Subject: [PATCH] check valid repos in ks to avoid confused error message like: $ touch touch.ks $ sudo mic cr raw touch.ks Warning: No module named zypp, skip plugin backend/zypppkgmgr Info: Retrieving repo metadata: DONE Error : Please specify a valid arch, your choise can be: thanks --- mic/conf.py | 5 ++++- mic/rt_util.py | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mic/conf.py b/mic/conf.py index 7eb2f22..fa74fab 100644 --- a/mic/conf.py +++ b/mic/conf.py @@ -204,6 +204,9 @@ class ConfigMgr(object): msger.info("Retrieving repo metadata:") ksrepos = misc.get_repostrs_from_ks(ks) + if not ksrepos: + raise errors.KsError('no valid repos found in ks file') + self.create['repomd'] = misc.get_metadata_from_repos( ksrepos, self.create['cachedir']) @@ -223,7 +226,7 @@ class ConfigMgr(object): msger.info("\nUse detected arch %s." % target_archlist[0]) else: raise errors.ConfigError("Please specify a valid arch, " - "your choise can be: %s" \ + "the choice can be: %s" \ % ', '.join(archlist)) kickstart.resolve_groups(self.create, self.create['repomd']) diff --git a/mic/rt_util.py b/mic/rt_util.py index 8de109c..ee3878e 100644 --- a/mic/rt_util.py +++ b/mic/rt_util.py @@ -119,7 +119,7 @@ def select_bootstrap(repomd, cachedir, bootstrapdir): repolist.append(bsrepo[repo]) repomd = misc.get_metadata_from_repos(repolist, cachedir) rpmver = misc.get_rpmver_in_repo(repomd) - if not rpmver: + if not rpmver: continue if compare_rpmversion(repo_rpmver, rpmver): msger.set_loglevel(lvl) @@ -140,7 +140,7 @@ def runmic_in_bootstrap(name, argv, opts, ksfile, repolist): msger.info("Sync native mic to bootstrap") copy_mic(bootstrap_env.rootdir) - # bind mounts , opts['cachedir'], opts['tmpdir'] + # bind mounts , opts['cachedir'], opts['tmpdir'] cwd = os.getcwd() lst = [cwd, opts['outdir']] if ksfile: -- 2.7.4