Merge pull request #40251 from mml/sudo

Automatic merge from submit-queue (batch tested with PRs 40251, 40171) Only run gcloud as root if we plan to change something. Only run gcloud as root if we plan to change something. Fixes bug introduced in #36292 @jlowdermilk @ixdy

Merge pull request #40251 from mml/sudo
7065c477 · Kubernetes Submit Queue · GitHub · 46bfa1ee · 0a4981eb · 7065c477
Commit 7065c477 authored Jan 23, 2017 by Kubernetes Submit Queue Committed by GitHub Jan 23, 2017
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

common.sh cluster/common.sh +1 -1

No files found.
--- a/cluster/common.sh
+++ b/cluster/common.sh
@@ -1069,7 +1069,7 @@ function update-or-verify-gcloud() {
    ${sudo_prefix} gcloud ${gcloud_prompt:-} components install beta
    ${sudo_prefix} gcloud ${gcloud_prompt:-} components update
  else
-    local version=$(${sudo_prefix} gcloud version --format=json)
+    local version=$(gcloud version --format=json)
    python -c'
 import json,sys
 from distutils import version