Author: forenr
Date: Sat Dec 24 12:59:33 2011
New Revision: 40545
URL: http://www.lyx.org/trac/changeset/40545
Log:
Fix bug #7933 (lyx2lyx error while running lyxpak.py)
Modified:
lyx-devel/branches/BRANCH_2_0_X/lib/scripts/lyxpak.py
lyx-devel/branches/BRANCH_2_0_X/status.20x
Modified: lyx-devel/branches/BRANCH_2_0_X/lib/scripts/lyxpak.py
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/lib/scripts/lyxpak.py Sat Dec 24
12:54:30 2011 (r40544)
+++ lyx-devel/branches/BRANCH_2_0_X/lib/scripts/lyxpak.py Sat Dec 24
12:59:33 2011 (r40545)
@@ -285,6 +285,10 @@
# Find the topmost dir common to all files
if len(incfiles) > 1:
topdir = os.path.commonprefix(incfiles)
+ # Check whether topdir is valid, as os.path.commonprefix() works on
+ # a character by character basis, rather than on path elements.
+ if not os.path.exists(topdir):
+ topdir = os.path.dirname(topdir) + os.path.sep
else:
topdir = os.path.dirname(incfiles[0]) + os.path.sep
Modified: lyx-devel/branches/BRANCH_2_0_X/status.20x
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/status.20x Sat Dec 24 12:54:30 2011
(r40544)
+++ lyx-devel/branches/BRANCH_2_0_X/status.20x Sat Dec 24 12:59:33 2011
(r40545)
@@ -103,6 +103,9 @@
- Fix problem with translation of theorem environments when language and
buffer encoding differ (bug 7941).
+- Fix python problem with common path prefixes when exporting a LyX archive
+ (bug 7933).
+
* TEX2LYX
