Attachment 203588 Details for Bug 237203 – fix upstream bug, add py-distro as dependency

[patch] fix upstream bug, add py-distro as dependency

py-google-compute-engine.patch.py-distro_deps (text/plain), 1.98 KB, created by Miroslav Lachman on 2019-04-11 12:31:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Miroslav Lachman

Created: 2019-04-11 12:31:01 UTC

Size: 1.98 KB

patch

obsolete

>diff -r -u -N py-google-compute-engine.orig/Makefile py-google-compute-engine/Makefile
>--- py-google-compute-engine.orig/Makefile	2018-11-23 20:07:40.000000000 +0000
>+++ py-google-compute-engine/Makefile	2019-04-11 11:35:01.465465000 +0000
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	google-compute-engine
> DISTVERSION=	2.8.6
>+PORTREVISION=	1
> CATEGORIES=	sysutils python
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> 
>@@ -17,6 +18,10 @@
> 		google_oslogin_control:sysutils/google-compute-engine-oslogin \
> 		sudo:security/sudo
> 
>+.if ${FLAVOR:Upy36:Mpy3*}
>+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}distro>0:sysutils/py-distro@${PY_FLAVOR}
>+.endif
>+
> USES=		python shebangfix
> USE_PYTHON=	autoplist concurrent distutils
> 
>diff -r -u -N py-google-compute-engine.orig/files/patch-google__compute__engine_compat.py py-google-compute-engine/files/patch-google__compute__engine_compat.py
>--- py-google-compute-engine.orig/files/patch-google__compute__engine_compat.py	1970-01-01 00:00:00.000000000 +0000
>+++ py-google-compute-engine/files/patch-google__compute__engine_compat.py	2019-04-11 11:35:29.121483000 +0000
>@@ -0,0 +1,23 @@
>+--- google_compute_engine/compat.py.orig	2018-10-11 16:53:23 UTC
>++++ google_compute_engine/compat.py
>+@@ -25,11 +25,17 @@ else:
>+   import platform as distro
>+ 
>+ if 'freebsd' in sys.platform:
>+-  distribution = distro.version().split()
>++  # Note: Do not use .version() method which is from either platform or distro
>++  # platform.version() and distro.version() return different values.
>++  # platform.version() returns 'FreeBSD 11.2-RELEASE-p9.....'
>++  # distro.version() returns '11.2'
>++  distro_name = 'freebsd'
>++  # distro_version is not used for FreeBSD later in this code
>++  distro_version = None
>+ else:
>+   distribution = distro.linux_distribution()
>+-distro_name = distribution[0].lower()
>+-distro_version = distribution[1].split('.')[0]
>++  distro_name = distribution[0].lower()
>++  distro_version = distribution[1].split('.')[0]
>+ distro_utils = None
>+ 
>+ if 'centos' in distro_name and distro_version == '6':

Actions: View | Diff

Attachments on bug 237203: 203588