From 4fae2f581d6a18b9af4a18c87cf7f9bdae86ac0c Mon Sep 17 00:00:00 2001
From: fijal <none@none>
Date: Wed, 7 Feb 2007 12:34:08 +0100
Subject: [PATCH] [svn r38051] Fix an option -s contradics -d

--HG--
branch : trunk
---
 py/test/rsession/rsession.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/py/test/rsession/rsession.py b/py/test/rsession/rsession.py
index cb0557c2e..bb6fa7b2a 100644
--- a/py/test/rsession/rsession.py
+++ b/py/test/rsession/rsession.py
@@ -29,6 +29,9 @@ class AbstractSession(Session):
         if option.runbrowser and not option.startserver:
             #print "--runbrowser implies --startserver"
             option.startserver = True
+        if option.nocapture:
+            print "Cannot use nocapture with distributed testing"
+            sys.exit(1)
         super(AbstractSession, self).fixoptions()
 
     def init_reporter(self, reporter, hosts, reporter_class, arg=""):