summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2013-07-18 11:13:18 +0100
committerRichard Maw <richard.maw@codethink.co.uk>2013-07-18 11:13:18 +0100
commit875e17d524166ded41d59cd2703d7cc8f6e1e45d (patch)
treeb161038b5ef00bd4a64c02e44fd846ea88ff0d9b
parentc9dfba54cdb967b10e10d511af89c2aad792f015 (diff)
parent51116210143775573854f9a1c31262c4246d8cd5 (diff)
downloaddefinitions-875e17d524166ded41d59cd2703d7cc8f6e1e45d.tar.gz
Merge branch 'baserock/richardmaw/bugfix/trovectl-cannot-add-sshkey'
Reviewed-by: Lars Wirzenius <lars.wirzenius@codethink.co.uk>
-rw-r--r--morphlib/plugins/trovectl_plugin.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/morphlib/plugins/trovectl_plugin.py b/morphlib/plugins/trovectl_plugin.py
index 7db2cbb5..80f3b4cf 100644
--- a/morphlib/plugins/trovectl_plugin.py
+++ b/morphlib/plugins/trovectl_plugin.py
@@ -49,5 +49,5 @@ class TrovectlPlugin(cliapp.Plugin):
trove = 'git@' + self.app.settings['trove-host']
self.app.runcmd(['ssh', trove] + args,
- stdout=None, stderr=None)
+ stdin=None, stdout=None, stderr=None)