Merge branch 'master' of git://gitorious.org/cmdtest/cmdtest

1 files changed, 6 insertions, 5 deletions

diff --git a/yarn b/yarn
index 9847a68..842f308 100755
--- a/yarn
+++ b/yarn
@@ -89,11 +89,12 @@ class YarnRunner(cliapp.Application):
             self.ts.error(msg)
 
     def process_args(self, args):
-        # Do we have tty? If not, turn on --verbose.
-        try:
-            open('/dev/tty', 'w')
-        except IOError:
-            self.settings['verbose'] = True
+        # Do we have tty? If not, turn on --verbose, unless --quiet.
+        if not self.settings['quiet']:
+            try:
+                open('/dev/tty', 'w')
+            except IOError:
+                self.settings['verbose'] = True
 
         self.ts = ttystatus.TerminalStatus(period=0.001)
         if not self.settings['quiet'] and not self.settings['verbose']: