From: Stephan Witt <switt@lyx.org>
Date: Sun, 13 May 2018 18:15:35 +0000 (+0200)
Subject: #11142 correct list of previous versions to check for user directory contents
X-Git-Tag: 2.3.1~79
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=26d0fb3dd54686b3965aa1e75944a5995f9136d7;p=lyx.git

#11142 correct list of previous versions to check for user directory contents

LyX on Mac uses a user directory with version suffix. On change of the version suffix
the existence of the directories with previous versions is checked and the latest one
is used for a copy on first configure run.

For 2.3 the candidate list starts with 2.2 now as it should.

(cherry picked from commit 17c3617c49487977e5c46de20cb450952c68b03d)
---

diff --git a/lib/configure.py b/lib/configure.py
index a2b651e1c9..627591298a 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -163,14 +163,14 @@ def checkUpgrade():
         logger.info('Checking for upgrade from previous version.')
         parent = os.path.dirname(cwd)
         appname = basename[:(-len(version_suffix))]
-        for version in ['-2.1', '-2.0', '-1.6' ]:
+        for version in ['-2.2', '-2.1', '-2.0', '-1.6' ]:
             logger.debug('Checking for upgrade from previous version ' + version)
             previous = os.path.join(parent, appname + version)
             logger.debug('previous = ' + previous)
             if os.path.isdir( previous ):
                 logger.info('Found directory "%s".', previous)
                 copy_tree( previous, cwd, True )
-                logger.info('Content copied to directory "%s".', cwd)
+                logger.info('Content copied from directory "%s".', previous)
                 return
 
 
diff --git a/status.23x b/status.23x
index 1b4acac92a..6bb13e6730 100644
--- a/status.23x
+++ b/status.23x
@@ -250,6 +250,8 @@ What's new
 
 - Fix horizontal alignment of some Box types on screen.
 
+- Correct list of previous versions to check for user directory contents
+  (bug 11142 on Mac).
 
 * INTERNALS