summaryrefslogtreecommitdiffstats
path: root/nova/process.py
diff options
context:
space:
mode:
authorMichael Gundlach <michael.gundlach@rackspace.com>2010-10-13 16:36:33 -0400
committerMichael Gundlach <michael.gundlach@rackspace.com>2010-10-13 16:36:33 -0400
commitbeebed574bba9ef0e7bbeedd554a13ad5ded375a (patch)
tree3b35c1e18dc6604023474f871903b0d12eabb02e /nova/process.py
parent79a2c349ca5772a69b6f7f28a768e711d6db1524 (diff)
parenta4aa6725be683e7e1f35df1e54069b755d19551b (diff)
downloadnova-beebed574bba9ef0e7bbeedd554a13ad5ded375a.tar.gz
nova-beebed574bba9ef0e7bbeedd554a13ad5ded375a.tar.xz
nova-beebed574bba9ef0e7bbeedd554a13ad5ded375a.zip
Merge from trunk
Diffstat (limited to 'nova/process.py')
-rw-r--r--nova/process.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/process.py b/nova/process.py
index b3cad894b..13cb90e82 100644
--- a/nova/process.py
+++ b/nova/process.py
@@ -113,7 +113,7 @@ class BackRelayWithInput(protocol.ProcessProtocol):
if self.started_deferred:
self.started_deferred.callback(self)
if self.process_input:
- self.transport.write(self.process_input)
+ self.transport.write(str(self.process_input))
self.transport.closeStdin()
def get_process_output(executable, args=None, env=None, path=None,