Merge lp:~sergiusens/snapcraft/1502449 into lp:~snappy-dev/snapcraft/core

[Sergio Schvezov]

Build packages failing to install on the host or not found should be the cause of of a failure

I didn't write a unit test for this as I noticed I was mocking the world.

[John Lenton (chipaca)]

review: Approve

[John Lenton (chipaca)]

Ah, oops. inline.

[lp:~sergiusens/snapcraft/1502449]

230. By Sergio Schvezov on 2015-10-04

Build packages failing to install on the host or not found should be the cause of of a failure

=== modified file 'snapcraft/cmds.py'
--- snapcraft/cmds.py	2015-10-02 18:25:33 +0000
+++ snapcraft/cmds.py	2015-10-04 20:03:53 +0000
@@ -294,16 +294,7 @@
         cmds = common.COMMAND_ORDER[0:common.COMMAND_ORDER.index(cmds[0]) + 1]
 
     config = _load_config()
-
-    # Install local packages that we need
-    if config.build_tools:
-        newPackages = []
-        for checkpkg in config.build_tools:
-            if subprocess.call(['dpkg-query', '-s', checkpkg], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) != 0:
-                newPackages.append(checkpkg)
-        if newPackages:
-            print("Installing required packages on the host system: " + ", ".join(newPackages))
-            subprocess.call(['sudo', 'apt-get', '-y', 'install'] + newPackages, stdout=subprocess.DEVNULL)
+    _install_build_packages(config.build_tools)
 
     # clean the snap dir before Snapping
     snap_clean = False
@@ -343,6 +334,23 @@
     return subprocess.check_call(args, **kwargs)
 
 
+def _install_build_packages(packages):
+    new_packages = []
+    for check_pkg in packages:
+        if subprocess.call(['dpkg-query', '-s', check_pkg], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) != 0:
+            new_packages.append(check_pkg)
+    if new_packages:
+        logger.info('Installing required packages on the host system')
+        try:
+            _check_call(
+                ['sudo', 'apt-get', '-y', 'install'] + new_packages,
+                stdout=subprocess.DEVNULL)
+        except subprocess.CalledProcessError:
+            logger.error('Could not find all the "build-packages" required '
+                         'in snapcraft.yaml')
+            sys.exit(1)
+
+
 def _load_config():
     global _config
     if _config: