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 78ef94bef79ec6eec472a0a9fd3482eaa57cc5c9..79e080b92f79e3493d1a244c9db17f73bbc344fe 100644 (file)
--- 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 9a2de0565a400db970b3e5f31c37fda0f0ea94df..426e1e7589e248c2cde91232ba60b6886a366ddb 100644 (file)
--- 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