Revert "Remove --buildbot patch check temporarily for emergency link DVT builds."
This reverts commit c6d212a0989c38829db69f863041fad22764ced4.
This is no longer necessary because link DVT now has its own branch.
Original-Change-Id: I327fcc9cc1785ef728274a1407509bbfb7fe67d6
BUG=chrome-os-partner:12554
TEST=Unit tests pass now.
Change-Id: Id39b1a90ccc952ce22886332d056d6a63442b475
Reviewed-on: https://gerrit.chromium.org/gerrit/30500
Tested-by: David James <davidjames@chromium.org>
Commit-Ready: David James <davidjames@chromium.org>
Reviewed-by: Brian Harring <ferringb@chromium.org>
diff --git a/scripts/cbuildbot.py b/scripts/cbuildbot.py
index 72f0acc..2067366 100644
--- a/scripts/cbuildbot.py
+++ b/scripts/cbuildbot.py
@@ -1029,6 +1029,13 @@
release_mode_with_patches = (options.buildbot and patches and
not options.debug)
+ # When running in release mode, make sure we are running with checked-in code.
+ # We want checked-in cbuildbot/scripts to prevent errors, and we want to build
+ # a release image with checked-in code for CrOS packages.
+ if release_mode_with_patches:
+ cros_build_lib.Die(
+ 'Cannot provide patches when running with --buildbot!')
+
if options.buildbot and options.remote_trybot:
cros_build_lib.Die(
'--buildbot and --remote-trybot cannot be used together.')