summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorEdward Cragg <edward.cragg@codethink.co.uk>2015-07-02 13:42:24 +0100
committerBaserock Gerrit <gerrit@baserock.org>2015-07-30 10:12:44 +0000
commit1db76a84dc4b16cdb9a51e3918883400cb8677c1 (patch)
tree63a31a3bc23c6ff0bfb2e125c4cac075f72abafe /extensions
parent97ab93845dae61c0e8d5c39c8f69c3cde82ff0d7 (diff)
downloaddefinitions-1db76a84dc4b16cdb9a51e3918883400cb8677c1.tar.gz
writeexts.py: Capture stderr so that errors are captured
The conversion from cliapp to the direct use of subprocess left a call which did not capture stderr, so `stderr=subprocess.STDOUT` is added to maintain the expected behaviour. Change-Id: I3ee0c064f9813d15004234d4daea81dc8219fc42
Diffstat (limited to 'extensions')
-rw-r--r--extensions/writeexts.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/extensions/writeexts.py b/extensions/writeexts.py
index 5c579a10..000c8270 100644
--- a/extensions/writeexts.py
+++ b/extensions/writeexts.py
@@ -369,7 +369,7 @@ class WriteExtension(Extension):
'--features', '^skinny-metadata',
'--features', '^mixed-bg',
'--nodesize', '4096',
- location])
+ location], stderr=subprocess.STDOUT)
except subprocess.CalledProcessError as e:
if 'unrecognized option \'--features\'' in e.output:
# Old versions of mkfs.btrfs (including v0.20, present in many