@@ -5,6 +5,7 @@ from __future__ import with_statement from contextlib import closing import logging import os +import re import simplejson from git_command import GitCommand @@ -46,7 +47,9 @@ class Manifest(object): @classmethod def from_json_file(cls, path): - data = simplejson.load(file(path)) + data_txt = file(path).read() + data_txt = re.sub(r'(?s)/\*.+?\*/', "", data_txt) + data = simplejson.loads(data_txt) return cls.from_dict(data, base_dir=os.path.abspath(os.path.dirname(path))) def add_project(self, project): manifest.py @@ -37,10 +37,12 @@ mkdir tests pushd tests cat > manifest.json <<EOF -{ +{ /* comment here! */ "remotes": {"origin": { "fetch": "$TESTDIR/%(name)s" }}, - +/* multi +line +comment*/ "projects": {"repo_a": { "track-tag": "commit_b" }} } shell-tests/follow_tag.sh c74181ac238ae911eadd0195607873fe7e1fe41f Todd Lipcon todd@cloudera.com http://github.com/cloudera/crepo/commit/ec69674460d8a4553e264826fcd662ce3b74c837 ec69674460d8a4553e264826fcd662ce3b74c837 2009-10-26T11:02:05-07:00 2009-10-26T11:01:49-07:00 Add c-style /* ... */ comment support 60a637c025dfcdfdaef868983fac3a37de9ef126 Todd Lipcon todd@cloudera.com