From 7d1ce06e64a679d99b1238b67ffa068b4c5b404c Mon Sep 17 00:00:00 2001 From: "laforge@chromium.org" Date: Sat, 11 Sep 2010 01:25:46 +0000 Subject: [PATCH] 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 --- drover.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drover.py b/drover.py index 9329fda2b..77922cd70 100755 --- a/drover.py +++ b/drover.py @@ -402,9 +402,11 @@ def drover(options, args): # Override the default properties if there is a drover.properties file. global file_pattern_ if os.path.exists("drover.properties"): - FILE_PATTERN = file_pattern_ - execfile("drover.properties") - file_pattern_ = FILE_PATTERN + f = open("drover.properties") + exec(f) + f.close() + if FILE_PATTERN: + file_pattern_ = FILE_PATTERN if options.revert and options.branch: url = BRANCH_URL.replace("$branch", options.branch)