From: Enrico Forestieri <forenr@lyx.org>
Date: Mon, 29 Aug 2011 22:23:17 +0000 (+0000)
Subject: Fix bug #7586 (Temporary file chkconfig.ltx in user directory not deleted if configur... 
X-Git-Tag: 2.0.1~6
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=550f683049aaf3dab78b44097ec602d882c0e1b0;p=features.git

Fix bug #7586 (Temporary file chkconfig.ltx in user directory not deleted if configure fails)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39567 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/lib/configure.py b/lib/configure.py
index 226a70d9b5..054cbd0793 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -1151,6 +1151,10 @@ def checkLatexConfig(check_config, bool_docbook):
             if line == "+Inspection done.":
                 ret = None
     #
+    # remove the copied file
+    if rmcopy:
+        removeFiles( [ 'chkconfig.ltx' ] )
+    #
     # currently, values in chhkconfig are only used to set
     # \font_encoding
     values = {}
@@ -1163,8 +1167,6 @@ def checkLatexConfig(check_config, bool_docbook):
         addToRC(r'\font_encoding "%s"' % values["chk_fontenc"])
     except:
         pass
-    if rmcopy:   # remove the copied file
-        removeFiles( [ 'chkconfig.ltx' ] )
     # if configure successed, move textclass.lst.tmp to textclass.lst
     # and packages.lst.tmp to packages.lst
     if os.path.isfile('textclass.lst.tmp') and len(open('textclass.lst.tmp').read()) > 0 \
diff --git a/status.20x b/status.20x
index 9dabce6d1e..30892d2532 100644
--- a/status.20x
+++ b/status.20x
@@ -263,6 +263,9 @@ What's new
 
 - On Windows, allow using again batch files as converters.
 
+- Fix configuration failure due to missed deletion of a temporary file
+  under certain circumstances (bug 7586).
+
 
 * ADVANCED FIND AND REPLACE