summaryrefslogtreecommitdiff
path: root/morphlib/util.py
diff options
context:
space:
mode:
Diffstat (limited to 'morphlib/util.py')
-rw-r--r--morphlib/util.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/morphlib/util.py b/morphlib/util.py
index 9b284d6e..e7a8a50e 100644
--- a/morphlib/util.py
+++ b/morphlib/util.py
@@ -15,13 +15,12 @@
import contextlib
import itertools
-import logging
import os
+import pipes
import re
import subprocess
import textwrap
-import cliapp
import fs.osfs
import morphlib
@@ -637,7 +636,8 @@ def error_message_for_containerised_commandline(
# rather than just dumping it in the error message, but that is better than
# nothing.
+ argv_string = ' '.join(map(pipes.quote, argv))
return 'Command failed: %s:\n' \
'Containerisation settings: %s\n' \
'Error output:\n%s' \
- % (' '.join(argv), container_kwargs, err)
+ % (argv_string, container_kwargs, err)