Skip to content

Commit

Permalink
tools: properly convert .gypi in install.py
Browse files Browse the repository at this point in the history
It was breaking during install when .gypi strings had quotes in
them. e.g.: 'foo': 'bar="baz"'
  • Loading branch information
mi-ac authored and hashseed committed Jul 19, 2018
1 parent d0a545c commit 5e5ffc8
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions tools/install.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python

import ast
import errno
import json
import os
import re
import shutil
Expand All @@ -20,9 +20,7 @@ def abspath(*args):

def load_config():
s = open('config.gypi').read()
s = re.sub(r'#.*?\n', '', s) # strip comments
s = re.sub(r'\'', '"', s) # convert quotes
return json.loads(s)
return ast.literal_eval(s)

def try_unlink(path):
try:
Expand Down

2 comments on commit 5e5ffc8

@targos
Copy link
Member

@targos targos commented on 5e5ffc8 Jul 20, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PR-URL: #21850

@hashseed
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm. I must have misused ncu to land this. Somehow none of the commit message changes I thought it made has been committed. :/

Please sign in to comment.