From c58866ed32ca85f93cd3bef97a690c256ef6ef99 Mon Sep 17 00:00:00 2001 From: "maruel@chromium.org" Date: Thu, 12 Apr 2012 20:26:01 +0000 Subject: isolate.py: Automatically create --outdir in --mode run merge_isolate.py: Allow loading files with CRLF EOL. R=rogerta@chromium.org BUG=98834 TEST= Review URL: http://codereview.chromium.org/10024080 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132044 0039d316-1c4b-4281-b951-d872f2087c98 --- tools/isolate/merge_isolate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/isolate/merge_isolate.py') diff --git a/tools/isolate/merge_isolate.py b/tools/isolate/merge_isolate.py index 07eb8676..df6f92b 100755 --- a/tools/isolate/merge_isolate.py +++ b/tools/isolate/merge_isolate.py @@ -359,7 +359,7 @@ def load_gyps(items): configs = Configs([]) for item in items: logging.debug('loading %s' % item) - new_config = load_gyp(eval_content(open(item, 'rb').read())) + new_config = load_gyp(eval_content(open(item, 'r').read())) logging.debug('has OSes: %s' % ','.join(k for k in new_config.per_os if k)) configs = union(configs, new_config) logging.debug('Total OSes: %s' % ','.join(k for k in configs.per_os if k)) -- cgit v1.1