From 536dc4479a312e3f73fb916ea3ada9dde8357838 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20St=C3=B6hr?= <uwestoehr@web.de>
Date: Fri, 7 Jan 2011 00:28:32 +0000
Subject: [PATCH] installer: don't use Python 3.x for LyX; fixes #7143

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@37143 a592a061-630c-0410-9148-cb99ea01b6c8
---
 development/Win32/packaging/AltInstaller/ChangeLog.txt    | 4 +++-
 .../Win32/packaging/AltInstaller/MissingPrograms.nsh      | 8 ++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/development/Win32/packaging/AltInstaller/ChangeLog.txt b/development/Win32/packaging/AltInstaller/ChangeLog.txt
index b1c7ecbe78..d2fb9c4b8c 100644
--- a/development/Win32/packaging/AltInstaller/ChangeLog.txt
+++ b/development/Win32/packaging/AltInstaller/ChangeLog.txt
@@ -1,7 +1,9 @@
 Version 4.27
 - LyX 1.6.9
-- updated to eLyXer 1.1.1
+- updated to eLyXer 1.1.2
 - updated to ImageMagick 6.6.x-y
+- fix bug that a detected installed Python 3.x was used for LyX (LyX bug 7143)
+  LyX only works properly with Python 2.x
 
 
 Version 4.26
diff --git a/development/Win32/packaging/AltInstaller/MissingPrograms.nsh b/development/Win32/packaging/AltInstaller/MissingPrograms.nsh
index 8746ac3cb6..640fa1a1dc 100644
--- a/development/Win32/packaging/AltInstaller/MissingPrograms.nsh
+++ b/development/Win32/packaging/AltInstaller/MissingPrograms.nsh
@@ -87,6 +87,8 @@ Function MissingPrograms
   # test if Python is installed
   # only use an existing python when it is version 2.5 or newer because some
   # older Compaq and Dell PCs were delivered with outdated Python interpreters
+  # Python 3.x was reported not to work with LyX properly, see
+  # http://www.lyx.org/trac/ticket/7143
   ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\2.5\InstallPath" ""
   ${if} $PythonPath == ""
    ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\2.6\InstallPath" ""
@@ -94,12 +96,6 @@ Function MissingPrograms
   ${if} $PythonPath == ""
    ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\2.7\InstallPath" ""
   ${endif}
-  ${if} $PythonPath == ""
-   ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\3.0\InstallPath" ""
-  ${endif}
-  ${if} $PythonPath == ""
-   ReadRegStr $PythonPath HKLM "Software\Python\PythonCore\3.1\InstallPath" ""
-  ${endif}
   ${if} $PythonPath != ""
    StrCpy $PythonPath $PythonPath -1 # remove the "\" at the end
    StrCpy $DelPythonFiles "True"