summaryrefslogtreecommitdiff
path: root/run-bootstrap-in-chroot
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2013-01-18 16:18:20 +0000
committerJavier Jardón <javier.jardon@codethink.co.uk>2013-01-22 18:34:22 +0000
commit7ef9cb8922bd933ae8ee58cb24a2b38844a0e629 (patch)
tree74f71465c0002d98b8c741f4d728dc3cf6f620ad /run-bootstrap-in-chroot
parenta8d30277932099dcae31f99d3fbd531f74eb0249 (diff)
downloadmorph-7ef9cb8922bd933ae8ee58cb24a2b38844a0e629.tar.gz
Parse as YAML if not valid JSON
Tests are currently broken, one because invalid JSON can be valid YAML, and coverage is incomplete.
Diffstat (limited to 'run-bootstrap-in-chroot')
-rwxr-xr-xrun-bootstrap-in-chroot2
1 files changed, 1 insertions, 1 deletions
diff --git a/run-bootstrap-in-chroot b/run-bootstrap-in-chroot
index 20a67c5a..fbe1e9f5 100755
--- a/run-bootstrap-in-chroot
+++ b/run-bootstrap-in-chroot
@@ -128,7 +128,7 @@ if ! "$snapshot" || ! has_pass pass1a; then
EXTRAPACKAGES="build-essential,gawk,bison,flex,python,autoconf"
EXTRAPACKAGES="$EXTRAPACKAGES,autopoint,automake,gettext,libtool"
EXTRAPACKAGES="$EXTRAPACKAGES,help2man,texinfo,sudo,ccache,gperf"
- EXTRAPACKAGES="$EXTRAPACKAGES,python-pip,python-simplejson"
+ EXTRAPACKAGES="$EXTRAPACKAGES,python-pip,python-simplejson,python-yaml"
EXTRAARGS=
if [ -n $ARCH]; then