Skip to content

Commit 446f174

Browse files
committed
mergejs: Remove white space around filename. No functional change. (closes #2026)
git-svn-id: http://svn.openlayers.org/trunk/openlayers@9170 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
1 parent 0200654 commit 446f174

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

lib/OpenLayers/Request.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* full text of the license. */
44

55
/**
6-
* @requires OpenLayers/Events.js
6+
* @requires OpenLayers/Events.js
77
*/
88

99
/**

tools/mergejs.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ def run (sourceDirectory, outputFilename = None, configFile = None):
152152
## TODO: Do import when we walk the directories above?
153153
for filepath in allFiles:
154154
print "Importing: %s" % filepath
155-
fullpath = os.path.join(sourceDirectory, filepath)
155+
fullpath = os.path.join(sourceDirectory, filepath).strip()
156156
content = open(fullpath, "U").read() # TODO: Ensure end of line @ EOF?
157157
files[filepath] = SourceFile(filepath, content) # TODO: Chop path?
158158

@@ -181,7 +181,7 @@ def run (sourceDirectory, outputFilename = None, configFile = None):
181181
order.append(filepath)
182182
if not files.has_key(filepath):
183183
print "Importing: %s" % filepath
184-
fullpath = os.path.join(sourceDirectory, filepath)
184+
fullpath = os.path.join(sourceDirectory, filepath).strip()
185185
content = open(fullpath, "U").read() # TODO: Ensure end of line @ EOF?
186186
files[filepath] = SourceFile(filepath, content) # TODO: Chop path?
187187

0 commit comments

Comments
 (0)