From: Georg Baum <Georg.Baum@post.rwth-aachen.de>
Date: Mon, 24 Oct 2005 14:13:45 +0000 (+0000)
Subject: fix line endings in layout2layout.py
X-Git-Tag: 1.6.10~13821
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=5d65c9bb09c6165c7662eb2c5f13418ea36f6fc2;p=features.git

fix line endings in layout2layout.py


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10570 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 78ef94bef7..79e080b92f 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-24  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
+
+	* scripts/layout2layout.py: fix line ending removal
+
 2005-10-21  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
 
 	* layouts/*.{inc,layout}: Add format information
diff --git a/lib/scripts/layout2layout.py b/lib/scripts/layout2layout.py
index 9a2de0565a..426e1e7589 100644
--- a/lib/scripts/layout2layout.py
+++ b/lib/scripts/layout2layout.py
@@ -29,7 +29,7 @@ def trim_eol(line):
     " Remove end of line char(s)."
     if line[-2:-1] == '\r':
         return line[:-2]
-    elif line[-1:-1] == '\r' or line[-1:-1] == '\n':
+    elif line[-1:] == '\r' or line[-1:] == '\n':
         return line[:-1]
     else:
         # file with no EOL in last line