From 8ea22292b7ca52ffa0e3ab3b01f109bbd4273e84 Mon Sep 17 00:00:00 2001 From: "maruel@chromium.org" Date: Mon, 13 Sep 2010 18:56:27 +0000 Subject: [PATCH] Fix code that is causing a pylint error in drover.py. The previous 'fix' would fail if drover.properties would contain FILE_PATTERN = None or something similar. TEST=none BUG=none Review URL: http://codereview.chromium.org/3363013 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@59254 0039d316-1c4b-4281-b951-d872f2087c98 --- drover.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drover.py b/drover.py index 77922cd70..2f726a5d1 100755 --- a/drover.py +++ b/drover.py @@ -402,9 +402,8 @@ def drover(options, args): # Override the default properties if there is a drover.properties file. global file_pattern_ if os.path.exists("drover.properties"): - f = open("drover.properties") - exec(f) - f.close() + FILE_PATTERN = file_pattern_ + execfile("drover.properties") if FILE_PATTERN: file_pattern_ = FILE_PATTERN