Index: tools/auto_bisect/bisect_utils.py |
diff --git a/tools/auto_bisect/bisect_utils.py b/tools/auto_bisect/bisect_utils.py |
index 330c4648508f91457200dbd3acbfd29efe0e75d2..c36399fac6c006797bc671cffdf8074afc9655d0 100644 |
--- a/tools/auto_bisect/bisect_utils.py |
+++ b/tools/auto_bisect/bisect_utils.py |
@@ -10,6 +10,7 @@ annotations for the Buildbot waterfall. |
import errno |
import imp |
+import json |
import os |
import shutil |
import stat |
@@ -274,9 +275,7 @@ def RunGClientAndCreateConfig(opts, custom_deps=None, cwd=None): |
spec[0]['custom_deps'][k] = v |
# Cannot have newlines in string on windows |
- spec = 'solutions =' + str(spec) |
- spec = ''.join([l for l in spec.splitlines()]) |
- |
+ spec = 'solutions=' + json.dumps(spec) |
qyearsley
2014/09/15 20:30:40
Is the spec interpreted as Python or JSON?
Most J
Sergiy Byelozyorov
2014/09/16 11:24:42
Does gclient interpret this as Python via eval? I
qyearsley
2014/09/16 18:59:18
Yeah, I think that gclient interprets it as Python
Sergiy Byelozyorov
2014/09/17 15:45:18
Done.
|
if 'android' in opts.target_platform: |
spec += GCLIENT_SPEC_ANDROID |
@@ -379,7 +378,6 @@ def SetupGitDepot(opts, custom_deps): |
if os.path.isfile(os.path.join('src', FILE_DEPS_GIT)): |
cwd = os.getcwd() |
os.chdir('src') |
- passed_deps_check = True |
if passed_deps_check: |
passed_deps_check = RemoveThirdPartyDirectory('libjingle') |
if passed_deps_check: |