diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-21 17:05:59 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-21 17:05:59 +0000 |
| commit | 779caa5ab274192a968b0fadf496df5984fcdcc1 (patch) | |
| tree | c535c6ce77c41be32d1bea6115d111a57f715a9e /PRESUBMIT.py | |
| parent | 27ba81c20f0c39dd2767e564e7ede982f0730261 (diff) | |
| download | chromium_src-779caa5ab274192a968b0fadf496df5984fcdcc1.zip chromium_src-779caa5ab274192a968b0fadf496df5984fcdcc1.tar.gz chromium_src-779caa5ab274192a968b0fadf496df5984fcdcc1.tar.bz2 | |
Don't block CQ usage when includes that violate temporarily-allowed
DEPS rules are added.
Includes that violate permant rules are still errors, and on upload
there is still a prompt, so the author of the change will definitely
know about the problem.
BUG=138280
Review URL: https://chromiumcodereview.appspot.com/10855266
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152581 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'PRESUBMIT.py')
| -rw-r--r-- | PRESUBMIT.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/PRESUBMIT.py b/PRESUBMIT.py index 0eefbff..ac8a719 100644 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -428,7 +428,13 @@ def _CheckUnwantedDependencies(input_api, output_api): 'You added one or more #includes that violate checkdeps rules.', error_descriptions)) if warning_descriptions: - results.append(output_api.PresubmitPromptWarning( + if not input_api.is_committing: + warning_factory = output_api.PresubmitPromptWarning + else: + # We don't want to block use of the CQ when there is a warning + # of this kind, so we only show a message when committing. + warning_factory = output_api.PresubmitNotifyResult + results.append(warning_factory( 'You added one or more #includes of files that are temporarily\n' 'allowed but being removed. Can you avoid introducing the\n' '#include? See relevant DEPS file(s) for details and contacts.', |