Merge lp:~smoser/curtin/trunk.install-kernel-fix into lp:~curtin-dev/curtin/trunk

[Scott Moser]

fix logic error in kernel installation

If a kernel package was available but not installed
the code would use the fallback path, rather than installing it.

This fixes the logic error and uses 'has_pkg_available'.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:328
https://server-team-jenkins.canonical.com/job/curtin-ci/68/
Executed test runs:
    None: https://server-team-jenkins.canonical.com/job/generic-update-mp/65/console

Click here to trigger a rebuild:
https://server-team-jenkins.canonical.com/job/curtin-ci/68/rebuild

review: Approve (continuous-integration)

[Ryan Harper (raharper)]

Do we have unittest for this? Would be a nice add.

=== modified file 'curtin/commands/curthooks.py'
--- curtin/commands/curthooks.py	2015-12-17 18:25:51 +0000
+++ curtin/commands/curthooks.py	2015-12-18 20:54:06 +0000
@@ -188,17 +188,21 @@
         package = "linux-{flavor}{map_suffix}".format(
             flavor=flavor, map_suffix=map_suffix)
 
-        util.apt_update(target)
-        out, err = in_chroot(['apt-cache', 'search', package], capture=True)
-
-        if (len(out.strip()) > 0 and
-                not util.has_pkg_installed(package, target)):
-            util.install_packages([package], target=target)
+        if util.has_pkg_available(package, target):
+            if util.has_pkg_installed(package, target):
+                LOG.debug("Kernel package '%s' already installed", package)
+            else:
+                LOG.debug("installing kernel package '%s'", package)
+                util.install_packages([package], target=target)
         else:
-            LOG.warn("Tried to install kernel %s but package not found."
-                     % package)
             if kernel_fallback is not None:
+                LOG.info("Kernel package '%s' not available.  "
+                         "Installing fallback package '%s'.",
+                         package, kernel_fallback)
                 util.install_packages([kernel_fallback], target=target)
+            else:
+                LOG.warn("Kernel package '%s' not available and no fallback."
+                         " System may not boot.", package)
 
 
 def apply_debconf_selections(cfg, target):