From 79fe46eae8b2f73d58d34b8474200606d30a775c Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Wed, 2 Jun 2010 04:55:45 -0400
Subject: Don't use --pager or --color with --output

---
 src/report.cc | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src')

diff --git a/src/report.cc b/src/report.cc
index 90de9a3f..cc652f8d 100644
--- a/src/report.cc
+++ b/src/report.cc
@@ -68,6 +68,13 @@ void report_t::normalize_options(const string& verb)
   }
 #endif
 
+  if (HANDLED(output_)) {
+    if (HANDLED(color) && ! HANDLED(force_color))
+      HANDLER(color).off();
+    if (HANDLED(pager_) && ! HANDLED(force_pager))
+      HANDLER(pager_).off();
+  }
+
   item_t::use_effective_date = (HANDLED(effective) &&
 				! HANDLED(actual_dates));
 
-- 
cgit v1.2.3