From 884b52c1224bc1bbaa3ee13ed4ce2c04a0e6c6e2 Mon Sep 17 00:00:00 2001 From: "pkasting@chromium.org" Date: Fri, 12 Dec 2014 19:26:49 +0000 Subject: [PATCH] Use grep -e --force instead of grep "--force" since apparently the latter doesn't work properly in all cases. BUG=441072 TEST=No errors from gclient :/ Review URL: https://codereview.chromium.org/802513003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@293380 0039d316-1c4b-4281-b951-d872f2087c98 --- update_depot_tools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update_depot_tools b/update_depot_tools index 039f6cdf69..7c12122517 100755 --- a/update_depot_tools +++ b/update_depot_tools @@ -140,7 +140,7 @@ if [ "X$DEPOT_TOOLS_UPDATE" != "X0" -a -e "$base_dir/.svn" ] then # Update the root directory to stay up-to-date with the latest depot_tools. BEFORE_REVISION=$(get_svn_revision) - if echo $* | grep "--force" > /dev/null; then + if echo $* | grep -e --force > /dev/null; then "$SVN" -q revert -R "$base_dir" fi "$SVN" -q up "$base_dir"