summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Denhartog2020-01-23 19:47:05 -0800
committerBenjamin Denhartog2020-01-23 20:41:46 -0800
commit5ab0c1c93ca87c61f7c794cc09d95e82682a76d1 (patch)
tree59736e201ae5172b35b81addc7df9306b9af6f69
parent8a9eff646c7a885158fde7e94da64e4ce3333763 (diff)
downloadaur-5ab0c1c93ca87c61f7c794cc09d95e82682a76d1.tar.gz
fix(google-cloud-sdk): add patch file to force dev_appserver.py to python2
dev_appserver.py does not currently support Python3. See `gcloud topic startup` [0] for more information. [0]: https://cloud.google.com/sdk/gcloud/reference/topic/startup
-rw-r--r--.SRCINFO4
-rw-r--r--0002-set-python2-for-dev-appserver-py.patch9
-rw-r--r--PKGBUILD6
3 files changed, 16 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2574a77d594b..43ed1dae2fc8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = google-cloud-sdk
pkgdesc = A set of command-line tools for the Google Cloud Platform. Includes gcloud (with beta and alpha commands), gsutil, and bq.
pkgver = 276.0.0
- pkgrel = 3
+ pkgrel = 4
url = https://cloud.google.com/sdk/
arch = x86_64
license = Apache
@@ -13,9 +13,11 @@ pkgbase = google-cloud-sdk
source = https://dl.google.com/dl/cloudsdk/release/downloads/for_packagers/linux/google-cloud-sdk_276.0.0.orig.tar.gz
source = google-cloud-sdk.sh
source = 0001-fix-console-io-syntax-warning.patch
+ source = 0002-set-python2-for-dev-appserver-py.patch
sha256sums = ad3d711e372fdcef141106d33e150aee4922a88c76484798a40b48a2fc779c3c
sha256sums = a54f88947a2593fae4aa8f65e42de4ad735583ae743735305c0f36710a794295
sha256sums = b3faeb3af2922510048d12063fa215610f12879f5cc9f8b78786c7d9f2957c70
+ sha256sums = 62ec7f56e09168d375823e9e99fcdcfbf40b0fffdd75f35cf91122c5902c82e9
pkgname = google-cloud-sdk
diff --git a/0002-set-python2-for-dev-appserver-py.patch b/0002-set-python2-for-dev-appserver-py.patch
new file mode 100644
index 000000000000..9332d42de003
--- /dev/null
+++ b/0002-set-python2-for-dev-appserver-py.patch
@@ -0,0 +1,9 @@
+diff -urN --color a/bin/dev_appserver.py b/bin/dev_appserver.py
+--- a/bin/dev_appserver.py 2020-01-23 19:38:55.457052071 -0800
++++ b/bin/dev_appserver.py 2020-01-23 19:41:10.211160929 -0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ #
+ # Copyright 2015 Google Inc. All Rights Reserved.
+ #
diff --git a/PKGBUILD b/PKGBUILD
index badec599fee3..d9589af040b7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
pkgname="google-cloud-sdk"
pkgver=276.0.0
-pkgrel=3
+pkgrel=4
pkgdesc="A set of command-line tools for the Google Cloud Platform. Includes gcloud (with beta and alpha commands), gsutil, and bq."
url="https://cloud.google.com/sdk/"
license=("Apache")
@@ -21,10 +21,12 @@ source=(
"https://dl.google.com/dl/cloudsdk/release/downloads/for_packagers/linux/${pkgname}_${pkgver}.orig.tar.gz"
"google-cloud-sdk.sh"
"0001-fix-console-io-syntax-warning.patch"
+ "0002-set-python2-for-dev-appserver-py.patch"
)
sha256sums=('ad3d711e372fdcef141106d33e150aee4922a88c76484798a40b48a2fc779c3c'
'a54f88947a2593fae4aa8f65e42de4ad735583ae743735305c0f36710a794295'
- 'b3faeb3af2922510048d12063fa215610f12879f5cc9f8b78786c7d9f2957c70')
+ 'b3faeb3af2922510048d12063fa215610f12879f5cc9f8b78786c7d9f2957c70'
+ '62ec7f56e09168d375823e9e99fcdcfbf40b0fffdd75f35cf91122c5902c82e9')
prepare() {
cd "$pkgname"