]> git.lyx.org Git - features.git/commitdiff
Revert "Check for old "LyX 2.3" user directory when configuring."
authorRichard Kimberly Heck <rikiheck@lyx.org>
Sat, 29 Sep 2018 21:29:27 +0000 (17:29 -0400)
committerRichard Kimberly Heck <rikiheck@lyx.org>
Sat, 29 Sep 2018 21:31:35 +0000 (17:31 -0400)
Actually, we DO use versioned directories on Windows.

This reverts commit b738aa53d13780a4e271459d72171700cba304fa.

lib/configure.py

index d9ed47783cf2c61b924b96d7e4dd6e49a77bd6bc..e64a8af54e6f8bb49f27c68cd404179d4ba3356a 100644 (file)
@@ -181,22 +181,6 @@ def checkUpgrade():
                 return
 
 
-def checkUpgradeWin():
-    ''' Check for upgrade from previous version '''
-    cwd = os.getcwd()
-    basename = os.path.basename(cwd)
-    if basename != "LyX":
-        return
-    lyxrc = os.path.join(cwd, outfile)
-    if os.path.isfile(lyxrc):
-        return
-    olddir = os.path.join(os.path.dirname(cwd), "LyX2.3")
-    if not os.path.isdir(oldir):
-        return
-    logger.info('Copying ' + olddir + ' into ' + cwd)
-    copy_tree(olddir, cwd, True)
-
-
 def createDirectories():
     ''' Create the build directories if necessary '''
     for dir in ['bind', 'clipart', 'doc', 'examples', 'images', 'kbd',
@@ -1856,8 +1840,6 @@ Options:
     setEnviron()
     if sys.platform == 'darwin' and len(version_suffix) > 0:
         checkUpgrade()
-    if os.name == 'nt':
-        checkUpgradeWin()
     createDirectories()
     dtl_tools = checkDTLtools()
     ## Write the first part of outfile