From: José Matos <jamatos@lyx.org>
Date: Sun, 2 Jun 2019 16:24:40 +0000 (+0100)
Subject: Import lyxpreview_tools directly and not only inside *if* conditions.
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=389d3707ae8f69f6a459c898ecfaf56bb1a05a85;p=features.git

Import lyxpreview_tools directly and not only inside *if* conditions.

This is related to the bug #11457 saga and it was my fault.

The debug files should be written only be on if the argument --debug is passed and not --verbose as it was done by mistake.
---

diff --git a/lib/scripts/lyxpreview2bitmap.py b/lib/scripts/lyxpreview2bitmap.py
index b02c5228c2..236010fbc3 100755
--- a/lib/scripts/lyxpreview2bitmap.py
+++ b/lib/scripts/lyxpreview2bitmap.py
@@ -79,6 +79,8 @@ from __future__ import print_function
 
 import getopt, glob, os, re, shutil, sys, tempfile
 
+import lyxpreview_tools
+
 from legacy_lyxpreview2ppm import extract_resolution, legacy_conversion_step1
 
 from lyxpreview_tools import bibtex_commands, check_latex_log, copyfileobj, \
@@ -343,7 +345,6 @@ def main(argv):
         elif opt == "--bg":
             bg_color = val
         elif opt in ("-d", "--debug"):
-            import lyxpreview_tools
             lyxpreview_tools.debug = True
         elif opt == "--dpi":
             try:
@@ -361,7 +362,6 @@ def main(argv):
         elif opt in ("--png", "--ppm"):
             output_format = opt[2:]
         elif opt in ("-v", "--verbose"):
-            import lyxpreview_tools
             lyxpreview_tools.verbose = True
 
     # Determine input file
@@ -378,7 +378,7 @@ def main(argv):
     if len(dir) != 0:
         os.chdir(dir)
 
-    if lyxpreview_tools.verbose:
+    if lyxpreview_tools.debug:
         f_out = open('debug.txt', 'a')
         sys.stdout = f_out
         sys.stderr = f_out