From 3c8ad19de519cadcdcf21f383ad09b6ac643605d Mon Sep 17 00:00:00 2001 From: Daniel Narvaez Date: Sun, 09 Dec 2012 00:46:15 +0000 Subject: orig_display might be None if runnning outside X --- (limited to 'devbot') 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() -- cgit v0.9.1