From 949c41107ab100bcab8c28c63b873af45e9747f1 Mon Sep 17 00:00:00 2001
From: Vassilii Khachaturov <vassilii@tarunz.org>
Date: Wed, 21 Aug 2013 17:24:18 +0000
Subject: [PATCH] action 'tool' CLI handler broken w/o DISPLAY

Preparing to port my fix for 6953: remove "undo history warning"
when the BatchTool run from cli (e.g., "check")
from gramps34, the ground state was worse in gramps40...

svn: r22898
---
 gramps/grampsapp.py         |  2 +-
 gramps/gui/plug/__init__.py | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/gramps/grampsapp.py b/gramps/grampsapp.py
index a38084e10..34f72ab40 100644
--- a/gramps/grampsapp.py
+++ b/gramps/grampsapp.py
@@ -420,7 +420,7 @@ def run():
         LOG.debug('environment: LANGUAGE is not defined')
     
     if argpars.need_gui():
-        #A GUI is needed, set it up
+        LOG.debug("A GUI is needed, set it up")
         if "--qml" in sys.argv:
             from .guiQML.grampsqml import startqml
             startqml(error, argpars)
diff --git a/gramps/gui/plug/__init__.py b/gramps/gui/plug/__init__.py
index 10c5beb09..edba6878b 100644
--- a/gramps/gui/plug/__init__.py
+++ b/gramps/gui/plug/__init__.py
@@ -29,11 +29,14 @@ __date__ ="$Apr 20, 2010 3:13:24 PM$"
 
 from . import tool
 
-from ._guioptions import make_gui_option, add_gui_options
-from gramps.gen.plug import MenuOptions
+try:
+    from ._guioptions import make_gui_option, add_gui_options
+    from ._dialogs import ReportPluginDialog, ToolPluginDialog
+    from . import _windows as PluginWindows
+except TypeError: # No GUI
+    pass
 
-from ._dialogs import ReportPluginDialog, ToolPluginDialog
-from . import _windows as PluginWindows
+from gramps.gen.plug import MenuOptions
 
 # This needs to go above Tool and MenuOption as it needs both
 class MenuToolOptions(MenuOptions, tool.ToolOptions):