From 5121a6235463f97d60fd91f0ae40e0899142db6c Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Sun, 21 Jul 2013 22:16:50 +0100
Subject: Make --quiet win over --verbose

---
 yarn | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/yarn b/yarn
index 6845345..97d5354 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']:
-- 
cgit v1.2.1