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 <config>: Please specify a valid arch, your choise can be:

<Found by Marko>
thanks

diff --git a/mic/conf.py b/mic/conf.py
index 7eb2f22e9f4bac7fdb2339d00f2a29ab72e06494..fa74fab193117a89fefc2530940ab3a300e81a4f 100644 (file)
--- 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 8de109c19c78c5c48bd11166cbf023f96b186920..ee3878e99c261d19b738889283d8dfb5d58db900 100644 (file)
--- 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: