summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorDon Garrett <dgarrett@google.com>2014-05-13 17:30:55 -0700
committerDon Garrett <dgarrett@chromium.org>2014-05-26 01:32:33 +0000
commit88b8d78c5da4a385ee42ca699ba400a5306ef111 (patch)
tree7c26fbb3c16c45b4bb23878bf2b251eb0cc76f68 /bin
parent43ad52887cc1e891c760e0491d987a2f887c6ce4 (diff)
downloadchromite-88b8d78c5da4a385ee42ca699ba400a5306ef111.tar.gz
Rename chromite.buildbot -> chromite.cbuildbot.
The cbuildbot script lives in a directory named buildbot. Which is a bit confusing. BUG=chromium:373277 TEST=Unitests + cros lint. CQ-DEPEND=CL:200157 CQ-DEPEND=CL:200165 CQ-DEPEND=CL:200149 CQ-DEPEND=CL:*163598 CQ-DEPEND=CL:*163760 CQ-DEPEND=CL:*163786 Change-Id: Ia5953a4506e8b47d27e1a6908ecb938a439da8c2 Reviewed-on: https://chromium-review.googlesource.com/199664 Reviewed-by: Don Garrett <dgarrett@chromium.org> Commit-Queue: Don Garrett <dgarrett@chromium.org> Tested-by: Don Garrett <dgarrett@chromium.org>
Diffstat (limited to 'bin')
-rwxr-xr-xbin/preupload_dump_config10
1 files changed, 5 insertions, 5 deletions
diff --git a/bin/preupload_dump_config b/bin/preupload_dump_config
index d774caad5..a6108fad3 100755
--- a/bin/preupload_dump_config
+++ b/bin/preupload_dump_config
@@ -3,14 +3,14 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-bin/cbuildbot_view_config -d --pretty > buildbot/config_dump.json
-if [ "$(git diff buildbot/config_dump.json)" ]; then
- echo "You have uncommitted changes to buildbot/config_dump.json"
- echo "This is likely because you have modified buildbot/cbuildbot_config.py"
+bin/cbuildbot_view_config -d --pretty > cbuildbot/config_dump.json
+if [ "$(git diff cbuildbot/config_dump.json)" ]; then
+ echo "You have uncommitted changes to cbuildbot/config_dump.json"
+ echo "This is likely because you have modified cbuildbot/cbuildbot_config.py"
echo "Please --amend your commit to include config_dump.json."
echo
echo "In future, you can update the dump file with the command"
- echo "bin/cbuildbot_view_config -d --pretty > buildbot/config_dump.json"
+ echo "bin/cbuildbot_view_config -d --pretty > cbuildbot/config_dump.json"
exit 1
fi