From 1de25d5f04d7203d4df268966941ccd94d029a79 Mon Sep 17 00:00:00 2001 From: crschmidt Date: Thu, 5 Apr 2007 03:51:32 +0000 Subject: [PATCH] make mergejs parsing more resilient to various line ending formats. this makes building work on windows again. git-svn-id: http://svn.openlayers.org/trunk/openlayers@3008 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf --- tools/mergejs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/mergejs.py b/tools/mergejs.py index 23acf81b4e..7dafd25785 100755 --- a/tools/mergejs.py +++ b/tools/mergejs.py @@ -117,9 +117,9 @@ class Config: """ Parses the content of the named file and stores the values. """ - lines = [line[:-1] # Assumes end-of-line character is present + lines = [line.strip() # Assumes end-of-line character is present for line in open(filename) - if line != "\n"] # Skip blank lines + if line.strip()] # Skip blank lines self.forceFirst = lines[lines.index("[first]") + 1:lines.index("[last]")]