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/util.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'morphlib/util.py')

diff --git a/morphlib/util.py b/morphlib/util.py
index 6f735387..736af92e 100644
--- a/morphlib/util.py
+++ b/morphlib/util.py
@@ -15,11 +15,13 @@
 
 import contextlib
 import itertools
+import logging
 import os
 import re
 import subprocess
 import textwrap
 
+import cliapp
 import fs.osfs
 
 import morphlib
@@ -626,3 +628,17 @@ def containerised_cmdline(args, cwd='.', root='/', binds=(),
     cmdargs.append(root)
     cmdargs.extend(args)
     return unshared_cmdline(cmdargs, root=root, **kwargs)
+
+
+def error_message_for_containerised_commandline(
+        argv, err, container_kwargs):  # pragma: no cover
+    '''Return a semi-readable error message for a containerised command.'''
+
+    # This function should do some formatting of the container_kwargs dict,
+    # rather than just dumping it in the error message, but that is better than
+    # nothing.
+
+    return 'Command failed: %s:\n' \
+           'Containerisation settings: %s\n' \
+           'Error output:\n%s' \
+           % (' '.join(argv), container_kwargs, err)
-- 
cgit v1.2.1


From ca24c606a043dd9dd6a380248f9d4d6dff3db597 Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam.thursfield@codethink.co.uk>
Date: Tue, 9 Dec 2014 13:10:27 +0000
Subject: Remove duplicate 'import' statement

---
 morphlib/util.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'morphlib/util.py')

diff --git a/morphlib/util.py b/morphlib/util.py
index 736af92e..9b284d6e 100644
--- a/morphlib/util.py
+++ b/morphlib/util.py
@@ -43,7 +43,6 @@ try:
     from multiprocessing import cpu_count
 except NotImplementedError:  # pragma: no cover
     cpu_count = lambda: 1
-import os
 
 
 def indent(string, spaces=4):
-- 
cgit v1.2.1