From 7e67d265288dee88018475fb72e63dcca14e494c Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam.thursfield@codethink.co.uk>
Date: Tue, 9 Dec 2014 13:04:26 +0000
Subject: Give less scary error messages when a containerised command fails

This affects errors encountered at build time and at system-integration time.

New errors look like this:

    ERROR: Command failed: baserock/system-integration/02-install-gerrit-gerrit-installation-binaries-misc-0000:
    Containerisation settings: {'mounts': (('dev/shm', 'tmpfs', 'none'), ('tmp', 'tmpfs', 'none')), 'mount_proc': True, 'root': '/var/tmp/staging/tmp1YQ2yN/minimal-system-x86_64-generic.inst'}
    Error output:
    + install -D /usr/share/gerrit/gerrit-2.9.war /home/gerrit2/gerrit/gerrit-2.9.war -o gerrit2 -g gerrit2 -m 644
    install: can't change ownership of /home/gerrit2/gerrit/gerrit-2.9.war: Operation not permitted

Previously the error message would have been this:

    Command failed: unshare --mount -- sh -ec.
    mount --make-rprivate /
    root="$1"
    shift
    while true; do
        case "$1" in
        --)
            shift
            break
            ;;
        *)
            mount_point="$1"
            mount_type="$2"
            mount_source="$3"
            shift 3
            path="$root/$mount_point"
            mount -t "$mount_type" "$mount_source" "$path"
            ;;
        esac
    done

    exec "$@"
     - /var/tmp/staging/tmppeA1Iw/gerrit-x86_64.inst/ dev/shm tmpfs none tmp tmpfs none -- linux-user-chroot --chdir . --mount-proc proc
    /var/tmp/staging/tmppeA1Iw/gerrit-x86_64.inst/ baserock/system-integration/02-install-gerrit-gerrit-installation-binaries-misc-0000
    + install -D /usr/share/gerrit/gerrit-2.9.war /home/gerrit2/gerrit/gerrit-2.9.war -o gerrit2 -g gerrit2 -m 644
    install: can't change ownership of /home/gerrit2/gerrit/gerrit-2.9.war: Operation not permitted
---
 morphlib/builder2.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'morphlib/builder2.py')

diff --git a/morphlib/builder2.py b/morphlib/builder2.py
index f71f21db..9e158ea1 100644
--- a/morphlib/builder2.py
+++ b/morphlib/builder2.py
@@ -665,11 +665,18 @@ class SystemBuilder(BuilderBase):  # pragma: no cover
         )
         try:
             for bin in sorted(os.listdir(sys_integration_dir)):
-                self.app.runcmd(
-                    morphlib.util.containerised_cmdline(
-                        [os.path.join(SYSTEM_INTEGRATION_PATH, bin)],
-                        root=rootdir, mounts=to_mount, mount_proc=True),
-                    env=env)
+                argv = [os.path.join(SYSTEM_INTEGRATION_PATH, bin)]
+                container_config = dict(
+                    root=rootdir, mounts=to_mount, mount_proc=True)
+                cmdline = morphlib.util.containerised_cmdline(
+                    argv, **container_config)
+                exit, out, err = self.app.runcmd_unchecked(
+                    cmdline, env=env)
+                if exit != 0:
+                    logging.debug('Command returned code %i', exit)
+                    msg = error_message_for_containerised_commandline(
+                        argv, err, container_config)
+                    raise cliapp.AppException(msg)
         except BaseException, e:
             self.app.status(
                     msg='Error while running system integration commands',
-- 
cgit v1.2.1