Commit 7d1ce06e authored by laforge@chromium.org's avatar laforge@chromium.org

Fix a break in drover.py that prevented webkit merges.

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@59179 0039d316-1c4b-4281-b951-d872f2087c98
parent aef9e440
...@@ -402,9 +402,11 @@ def drover(options, args): ...@@ -402,9 +402,11 @@ def drover(options, args):
# Override the default properties if there is a drover.properties file. # Override the default properties if there is a drover.properties file.
global file_pattern_ global file_pattern_
if os.path.exists("drover.properties"): if os.path.exists("drover.properties"):
FILE_PATTERN = file_pattern_ f = open("drover.properties")
execfile("drover.properties") exec(f)
file_pattern_ = FILE_PATTERN f.close()
if FILE_PATTERN:
file_pattern_ = FILE_PATTERN
if options.revert and options.branch: if options.revert and options.branch:
url = BRANCH_URL.replace("$branch", options.branch) url = BRANCH_URL.replace("$branch", options.branch)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment