summaryrefslogtreecommitdiffstats
path: root/webkit/build
diff options
context:
space:
mode:
authormnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-30 12:27:51 +0000
committermnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-30 12:27:51 +0000
commite2ffad7381137e4df046d6fb9aabecfdd712e208 (patch)
treec71823ce8421160f75614b22a7431617e2ba88c3 /webkit/build
parentd6e2db3455ddbe0030de617f658e2fe646ea0c72 (diff)
downloadchromium_src-e2ffad7381137e4df046d6fb9aabecfdd712e208.zip
chromium_src-e2ffad7381137e4df046d6fb9aabecfdd712e208.tar.gz
chromium_src-e2ffad7381137e4df046d6fb9aabecfdd712e208.tar.bz2
Fix error reporting in concatenate_js_files.py script.
Review URL: http://codereview.chromium.org/3237004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57851 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build')
-rwxr-xr-xwebkit/build/concatenate_js_files.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/webkit/build/concatenate_js_files.py b/webkit/build/concatenate_js_files.py
index f371c8d..f6c4a8f 100755
--- a/webkit/build/concatenate_js_files.py
+++ b/webkit/build/concatenate_js_files.py
@@ -52,7 +52,8 @@ def main(argv):
return 1
output_file_name = argv.pop()
- extractor = OrderedJSFilesExtractor(argv[1])
+ input_order_file_name = argv[1]
+ extractor = OrderedJSFilesExtractor(input_order_file_name)
expander = PathExpander(argv[2:])
output = StringIO()
@@ -61,7 +62,7 @@ def main(argv):
if (full_path is None):
raise Exception('File %s referenced in %s not found on any source paths, '
'check source tree for consistency' %
- (input_file_name, input_file_name))
+ (input_file_name, input_order_file_name))
output.write('/* %s */\n\n' % input_file_name)
input_file = open(full_path, 'r')
output.write(input_file.read())