From 2b802de836e90ae65f3ea4ef391b6df2fc28aba3 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 6 Oct 2014 01:18:51 -0400 Subject: [PATCH] image_signing: ignore missing chrome_dev.conf If we try to sign an image w/out Chrome, this file won't exist. Run grep with the -s flag to silence those warnings. BUG=chromium:418817 TEST=`cbuildbot storm-release` no longer warns BRANCH=None Change-Id: Ibac0978e3e4d9f89c00206a2dd21c1d71544f710 Reviewed-on: https://chromium-review.googlesource.com/221184 Reviewed-by: Gaurav Shah Tested-by: Mike Frysinger Commit-Queue: Mike Frysinger --- scripts/image_signing/ensure_no_nonrelease_files.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/image_signing/ensure_no_nonrelease_files.sh b/scripts/image_signing/ensure_no_nonrelease_files.sh index e40aadab0c..339e5fe95a 100755 --- a/scripts/image_signing/ensure_no_nonrelease_files.sh +++ b/scripts/image_signing/ensure_no_nonrelease_files.sh @@ -51,7 +51,7 @@ main() { # Verify that session_manager isn't configured to pass additional # environment variables or command-line arguments to Chrome. local config_path="$rootfs/etc/chrome_dev.conf" - local matches=$(grep "^[^#]" "${config_path}") + local matches=$(grep -s "^[^#]" "${config_path}") if [ -n "$matches" ]; then echo "FAIL: Found commands in $config_path:" echo "$matches"