[LyX/master] Improved copy operation for user directory contents of previous major releases

Stephan Witt st.witt at gmx.net
Sat Apr 13 12:28:31 UTC 2024


This is a change I strongly suggest to port back to 2.4.0 and 2.4.1.

It will not harm and should avoid a possible problem like Jerry reported with RC3.

Stephan 

> Am 11.04.2024 um 18:32 schrieb Stephan Witt <switt at lyx.org>:
> 
> commit 945a02e2e176e0f8fb9c599700c693032a01fa5d
> Author: Stephan Witt <switt at lyx.org>
> Date:   Thu Apr 11 18:30:29 2024 +0200
> 
>    Improved copy operation for user directory contents of previous major releases
> 
>    - avoid copying of configure.log
>    - avoid copying of chkconfig.ltx
>      There is a report of a hang on first start of LyX with new major release.
>      The removal of the chkconfig.ltx (leftover from early LyX versions) fixed the issue.
> ---
> lib/configure.py | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/configure.py b/lib/configure.py
> index 80cc787230..df0251268a 100644
> --- a/lib/configure.py
> +++ b/lib/configure.py
> @@ -157,8 +157,8 @@ def copy_tree(src, dst, preserve_symlinks=False, level=0):
>             link_dest = os.readlink(src_name)
>             os.symlink(link_dest, dst_name)
>             outputs.append(dst_name)
> -        elif level == 0 and name == 'cache':
> -            logger.info("Skip cache %s", src_name)
> +        elif level == 0 and name in [ 'cache', 'configure.log', 'chkconfig.ltx' ]:
> +            logger.info("Skip copy of %s", src_name)
>         elif os.path.isdir(src_name):
>             outputs.extend(
>                 copy_tree(src_name, dst_name, preserve_symlinks, level=(level + 1)))
> -- 
> lyx-cvs mailing list
> lyx-cvs at lists.lyx.org
> http://lists.lyx.org/mailman/listinfo/lyx-cvs



More information about the lyx-devel mailing list