Merge pull request #125125 from iAmMrinal0/update/google-cloud-sdk
google-cloud-sdk: 340.0.0 -> 342.0.0
This commit is contained in:
commit
932a08e95c
|
@ -21,18 +21,18 @@ let
|
||||||
sources = name: system: {
|
sources = name: system: {
|
||||||
x86_64-darwin = {
|
x86_64-darwin = {
|
||||||
url = "${baseUrl}/${name}-darwin-x86_64.tar.gz";
|
url = "${baseUrl}/${name}-darwin-x86_64.tar.gz";
|
||||||
sha256 = "1ag8h8gj3cld2qxqdrrqdwrz3d9d5m4c2wkx7b78vjpimv76qx5d";
|
sha256 = "1mrhzg07dm11dirxhwdpxz9rch65z631abss0khdi944l3zv8lq4";
|
||||||
};
|
};
|
||||||
|
|
||||||
x86_64-linux = {
|
x86_64-linux = {
|
||||||
url = "${baseUrl}/${name}-linux-x86_64.tar.gz";
|
url = "${baseUrl}/${name}-linux-x86_64.tar.gz";
|
||||||
sha256 = "1mm9lvbgszr5d6gs1qqn63012mgxq94xxkcc400fgfx3apzpkbpj";
|
sha256 = "0m8zbjzr9a4f13z4szhqs5296lmyqrfmxr7pyvy8mrap3fqxvv02";
|
||||||
};
|
};
|
||||||
}.${system};
|
}.${system};
|
||||||
|
|
||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation rec {
|
||||||
pname = "google-cloud-sdk";
|
pname = "google-cloud-sdk";
|
||||||
version = "340.0.0";
|
version = "342.0.0";
|
||||||
|
|
||||||
src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system);
|
src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system);
|
||||||
|
|
||||||
|
|
|
@ -1,16 +1,8 @@
|
||||||
diff --git a/platform/gsutil/gslib/command_runner.py b/platform/gsutil/gslib/command_runner.py
|
diff --git a/platform/gsutil/gslib/command_runner.py b/platform/gsutil/gslib/command_runner.py
|
||||||
index 06ca5e5..4a4e225 100644
|
index f490bb3..dc6bbcc 100644
|
||||||
--- a/platform/gsutil/gslib/command_runner.py
|
--- a/platform/gsutil/gslib/command_runner.py
|
||||||
+++ b/platform/gsutil/gslib/command_runner.py
|
+++ b/platform/gsutil/gslib/command_runner.py
|
||||||
@@ -61,7 +61,6 @@ from gslib.utils.text_util import InsistAsciiHeaderValue
|
@@ -330,17 +330,6 @@ class CommandRunner(object):
|
||||||
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:
|
Returns:
|
||||||
Return value(s) from Command that was run.
|
Return value(s) from Command that was run.
|
||||||
"""
|
"""
|
||||||
|
@ -28,7 +20,7 @@ index 06ca5e5..4a4e225 100644
|
||||||
if not args:
|
if not args:
|
||||||
args = []
|
args = []
|
||||||
|
|
||||||
@@ -414,18 +402,10 @@ class CommandRunner(object):
|
@@ -413,18 +402,10 @@ class CommandRunner(object):
|
||||||
ShutDownGsutil()
|
ShutDownGsutil()
|
||||||
if GetFailureCount() > 0:
|
if GetFailureCount() > 0:
|
||||||
return_code = 1
|
return_code = 1
|
||||||
|
|
Loading…
Reference in a new issue