Re: [LyX/master] #11142 correct list of previous version to check for user directory contents

[Stephan Witt]

Am 13.05.2018 um 20:16 schrieb Stephan Witt <sw...@lyx.org>:
> 
> commit 17c3617c49487977e5c46de20cb450952c68b03d
> Author: Stephan Witt <sw...@lyx.org>
> Date:   Sun May 13 20:15:35 2018 +0200
> 
>    #11142 correct list of previous version 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.4 
> the candidate list starts with 2.3 now as it should.
> ---
> lib/configure.py |    4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/configure.py b/lib/configure.py
> index a46ae23..ba4c004 100644
> --- a/lib/configure.py
> +++ b/lib/configure.py
> @@ -168,14 +168,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.3', '-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

Riki, I’d like to fix it in branch too. Is the attached patch ok?

bug-11142-branch.patch
Description: Binary data