diff options
author | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2015-02-24 14:55:57 +0000 |
---|---|---|
committer | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2015-02-27 15:23:12 +0000 |
commit | 8630ac06ecc1813b76ae58d1fc27ea6158ac781b (patch) | |
tree | d2230a55c03dce048d18c2895b3e200201463ede | |
parent | f7bbd450120f230ee6793d917681b48d172c5d3d (diff) | |
download | definitions-8630ac06ecc1813b76ae58d1fc27ea6158ac781b.tar.gz |
pxeboot: avoid setting stdout=None when running rsync
If stdout=None, rsync hangs and the following error occurs
error: uncaptured python exception, closing channel
<morphlib.extensions._OutputDispatcher connected at 0x7f9bd5acf8> (<type
'exceptions.ValueError'>:unsupported format character 'k' (0x6b) at
index 29 [/usr/lib/python2.7/asyncore.py|readwrite|108]
[/usr/lib/python2.7/asyncore.py|handle_read_event|449]
[/usr/lib/python2.7/asynchat.py|handle_read|165]
[/usr/lib/python2.7/site-packages/morphlib/extensions.py|found_terminator|196]
[/usr/lib/python2.7/site-packages/morphlib/plugins/deploy_plugin.py|_report_extension_stdout|615]
[/usr/lib/python2.7/site-packages/morphlib/app.py|status|345])
-rwxr-xr-x | pxeboot.write | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pxeboot.write b/pxeboot.write index ef88228d..38fa4846 100755 --- a/pxeboot.write +++ b/pxeboot.write @@ -368,7 +368,8 @@ class PXEBoot(morphlib.writeexts.WriteExtension): nfsroot = urlparse.urlunsplit((url.scheme, url.netloc, tempdir, url.query, url.fragment)) cliapp.runcmd(['rsync', '-asXSPH', '--delete', rootfs, nfsroot], - stdin=None, stdout=None, stderr=None) + stdin=None, stdout=open(os.devnull, 'w'), + stderr=None) yield os.path.join(os.path.basename(tempdir), os.path.basename(rootfs)) |