summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Scherer <misc@zarb.org>2014-12-14 17:56:18 +0100
committerJames Cammarata <jimi@sngx.net>2015-02-17 14:23:27 -0600
commitdaa3f2be5559b90181049283ae70eb7c2b45fb50 (patch)
tree2b1dc3e1b54255bf036018ed086a485d2ae4dd71
parent31978121e19518f7f5d4e0005982367b989c3a3f (diff)
downloadansible-daa3f2be5559b90181049283ae70eb7c2b45fb50.tar.gz
Do not assume that stdin is a tty
This can be used from another non interactive software, see #9695 for details.
-rwxr-xr-xbin/ansible-doc5
1 files changed, 4 insertions, 1 deletions
diff --git a/bin/ansible-doc b/bin/ansible-doc
index 0ba84b9a30..59d14b6ef1 100755
--- a/bin/ansible-doc
+++ b/bin/ansible-doc
@@ -165,7 +165,10 @@ def get_snippet_text(doc):
return "\n".join(text)
def get_module_list_text(module_list):
- columns = max(60, int(os.popen('stty size', 'r').read().split()[1]))
+ tty_size = 0
+ if os.isatty(0):
+ tty_size = int(os.popen('stty size', 'r').read().split()[1])
+ columns = max(60, tty_size)
displace = max(len(x) for x in module_list)
linelimit = columns - displace - 5
text = []