Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/devbot/xvfb.py
diff options
context:
space:
mode:
authorDaniel Narvaez <dwnarvaez@gmail.com>2012-12-09 00:46:15 (GMT)
committer Daniel Narvaez <dwnarvaez@gmail.com>2012-12-09 00:46:15 (GMT)
commit3c8ad19de519cadcdcf21f383ad09b6ac643605d (patch)
tree97de26ab3f85b5c2e8eef2165e7edb2749fd3c6e /devbot/xvfb.py
parent21f6392e30b31479d7aa06fac66ebcf25164abc6 (diff)
orig_display might be None if runnning outside X
Diffstat (limited to 'devbot/xvfb.py')
-rw-r--r--devbot/xvfb.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/devbot/xvfb.py b/devbot/xvfb.py
index a70b4c8..adc72f0 100644
--- a/devbot/xvfb.py
+++ b/devbot/xvfb.py
@@ -23,5 +23,7 @@ def start():
return (xvfb_proc, orig_display)
def stop(xvfb_proc, orig_display):
- os.environ["DISPLAY"] = orig_display
+ if orig_display is not None:
+ os.environ["DISPLAY"] = orig_display
+
xvfb_proc.terminate()