Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

google-cloud-sdk: fix gsutil startup crash #80010

Merged
merged 2 commits into from Feb 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions pkgs/tools/admin/google-cloud-sdk/default.nix
Expand Up @@ -42,6 +42,7 @@ in stdenv.mkDerivation rec {

patches = [
./gcloud-path.patch
./gsutil-disable-updates.patch
edef1c marked this conversation as resolved.
Show resolved Hide resolved
];

installPhase = ''
Expand Down Expand Up @@ -83,6 +84,7 @@ in stdenv.mkDerivation rec {

# remove tests and test data
find $out -name tests -type d -exec rm -rf '{}' +
rm $out/google-cloud-sdk/platform/gsutil/gslib/commands/test.py

# compact all the JSON
find $out -name \*.json | while read path; do
Expand Down
50 changes: 50 additions & 0 deletions pkgs/tools/admin/google-cloud-sdk/gsutil-disable-updates.patch
@@ -0,0 +1,50 @@
diff --git a/platform/gsutil/gslib/command_runner.py b/platform/gsutil/gslib/command_runner.py
index 06ca5e5..4a4e225 100644
--- a/platform/gsutil/gslib/command_runner.py
+++ b/platform/gsutil/gslib/command_runner.py
@@ -61,7 +61,6 @@ from gslib.utils.text_util import InsistAsciiHeaderValue
from gslib.utils.text_util import print_to_fd
from gslib.utils.unit_util import SECONDS_PER_DAY
from gslib.utils.update_util import LookUpGsutilVersion
-from gslib.tests.util import HAS_NON_DEFAULT_GS_HOST


def HandleHeaderCoding(headers):
@@ -331,17 +330,6 @@ class CommandRunner(object):
Returns:
Return value(s) from Command that was run.
"""
- command_changed_to_update = False
- if (not skip_update_check and
- self.MaybeCheckForAndOfferSoftwareUpdate(command_name, debug)):
- command_name = 'update'
- command_changed_to_update = True
- args = [_StringToSysArgType('-n')]
-
- # Check for opt-in analytics.
- if system_util.IsRunningInteractively() and collect_analytics:
- metrics.CheckAndMaybePromptForAnalyticsEnabling()
-
if not args:
args = []

@@ -414,18 +402,10 @@ class CommandRunner(object):
ShutDownGsutil()
if GetFailureCount() > 0:
return_code = 1
- if command_changed_to_update:
- # If the command changed to update, the user's original command was
- # not executed.
- return_code = 1
- print('\n'.join(
- textwrap.wrap(
- 'Update was successful. Exiting with code 1 as the original command '
- 'issued prior to the update was not executed and should be re-run.'
- )))
return return_code

def MaybeCheckForAndOfferSoftwareUpdate(self, command_name, debug):
+ return False
"""Checks the last time we checked for an update and offers one if needed.

Offer is made if the time since the last update check is longer