diff --git a/Authors b/Authors index 28b803e7..caab5f5e 100644 --- a/Authors +++ b/Authors @@ -28,6 +28,7 @@ Josh Kearney Justin Santa Barbara Justin Shepherd Ken Pepple +Ken Thomas Kevin L. Mitchell Lorin Hochstein Major Hayden diff --git a/bin/glance b/bin/glance index 883380a9..e11addd8 100755 --- a/bin/glance +++ b/bin/glance @@ -1000,6 +1000,10 @@ def user_confirm(prompt, default=False): else: prompt_default = "[y/N]" + # for bug 884116, don't issue the prompt if stdin isn't a tty + if not hasattr(sys.stdin, 'isatty') or not sys.stdin.isatty(): + return default + answer = raw_input("%s %s " % (prompt, prompt_default)) if answer == "":