anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-06 00:10:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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.4 the candidate list starts with 2.3 now as it should.
This commit is contained in:
Stephan Witt 2018-05-13 20:15:35 +02:00
parent 9dd8de0c80
commit 17c3617c49
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/configure.py
View File

@ -168,14 +168,14 @@ def checkUpgrade():
logger.info('Checking for upgrade from previous version.') logger.info('Checking for upgrade from previous version.')
parent = os.path.dirname(cwd) parent = os.path.dirname(cwd)
appname = basename[:(-len(version_suffix))] appname = basename[:(-len(version_suffix))]
for version in ['-2.1', '-2.0', '-1.6' ]: for version in ['-2.3', '-2.2', '-2.1', '-2.0', '-1.6' ]:
logger.debug('Checking for upgrade from previous version ' + version) logger.debug('Checking for upgrade from previous version ' + version)
previous = os.path.join(parent, appname + version) previous = os.path.join(parent, appname + version)
logger.debug('previous = ' + previous) logger.debug('previous = ' + previous)
if os.path.isdir( previous ): if os.path.isdir( previous ):
logger.info('Found directory "%s".', previous) logger.info('Found directory "%s".', previous)
copy_tree( previous, cwd, True ) copy_tree( previous, cwd, True )
logger.info('Content copied to directory "%s".', cwd) logger.info('Content copied from directory "%s".', previous)
return return