summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2014-07-31 15:34:26 +0000
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2014-07-31 17:05:47 +0000
commitefb813d31fca292ba4dabce44d674d8317615e46 (patch)
treeff930a8d36d5569f193d10aa583bdcab3d4d10c3
parenta5d9c4a0e725d0ba3894c6506e642f99301af7ef (diff)
downloadmorph-baserock/liw/distbuild-fixes.tar.gz
Remove unicode-escape encoding in deploy pluginbaserock/liw/distbuild-fixes
Without this change, I can't deploy anything. It always crashes with this error: 2014-07-31 15:11:07 [distbuild-system-x86_64][controller]Writing deployment metadata file Traceback (most recent call last): File "/usr/lib/python2.7/site-packages/cliapp/app.py", line 190, in _run self.process_args(args) File "/usr/lib/python2.7/site-packages/morphlib/app.py", line 263, in process_args cliapp.Application.process_args(self, args) File "/usr/lib/python2.7/site-packages/cliapp/app.py", line 539, in process_args method(args[1:]) File "/usr/lib/python2.7/site-packages/morphlib/plugins/deploy_plugin.py", line 355, in deploy deployments, parent_location='') File "/usr/lib/python2.7/site-packages/morphlib/plugins/deploy_plugin.py", line 434, in deploy_system location, final_env) File "/usr/lib/python2.7/site-packages/morphlib/plugins/deploy_plugin.py", line 501, in setup_deploy sort_keys=True, encoding='unicode-escape') File "/usr/lib/python2.7/json/__init__.py", line 181, in dump for chunk in iterable: File "/usr/lib/python2.7/json/encoder.py", line 428, in _iterencode for chunk in _iterencode_dict(o, _current_indent_level): File "/usr/lib/python2.7/json/encoder.py", line 402, in _iterencode_dict for chunk in chunks: File "/usr/lib/python2.7/json/encoder.py", line 384, in _iterencode_dict yield _encoder(value) File "/usr/lib/python2.7/json/encoder.py", line 227, in _encoder o = o.decode(_encoding) UnicodeDecodeError: 'unicodeescape' codec can't decode bytes in position 14-16: truncated \uXXXX escape
-rw-r--r--morphlib/plugins/deploy_plugin.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/morphlib/plugins/deploy_plugin.py b/morphlib/plugins/deploy_plugin.py
index 38c17bc2..4c4b75a1 100644
--- a/morphlib/plugins/deploy_plugin.py
+++ b/morphlib/plugins/deploy_plugin.py
@@ -498,7 +498,7 @@ class DeployPlugin(cliapp.Plugin):
system_tree, 'baserock', 'deployment.meta')
with morphlib.savefile.SaveFile(metadata_path, 'w') as f:
json.dump(metadata, f, indent=4,
- sort_keys=True, encoding='unicode-escape')
+ sort_keys=True)
return system_tree
except Exception:
shutil.rmtree(system_tree)