summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <daniel.silverstone@codethink.co.uk>2013-03-13 18:05:13 +0000
committerDaniel Silverstone <daniel.silverstone@codethink.co.uk>2013-03-13 18:05:13 +0000
commitd74d1afc9668c4b22e081f0799ad4fcba6bc6362 (patch)
treedd13e8b9ebb849d9309cf2f10b33e13b5f553233
parent1ad0e599c173f90b193c717f569252364d64b1cd (diff)
downloadlorry-d74d1afc9668c4b22e081f0799ad4fcba6bc6362.tar.gz
Ensure we only set stdin if it's not already set
-rwxr-xr-xlorry3
1 files changed, 2 insertions, 1 deletions
diff --git a/lorry b/lorry
index e2fed04..610a218 100755
--- a/lorry
+++ b/lorry
@@ -461,7 +461,8 @@ class Lorry(cliapp.Application):
kwargs['stdout'] = open(self.settings['command-stdout'], 'a')
if self.settings['command-stderr']:
kwargs['stderr'] = open(self.settings['command-stderr'], 'a')
- kwargs['stdin'] = open('/dev/null', 'r')
+ if 'stdin' not in kwargs:
+ kwargs['stdin'] = open('/dev/null', 'r')
logging.debug('Running: argv=%s kwargs=%s' %
(repr(argv), repr(kwargs)))
exit, out, err = self.runcmd_unchecked(argv, **kwargs)