Attachment #203588 for bug #237203

View | Details | Raw Unified | Return to bug 237203
Collapse All | Expand All

Lines 2-7 Link Here

(-)py-google-compute-engine/Makefile (+5 lines)
2		2
3	PORTNAME= google-compute-engine	3	PORTNAME= google-compute-engine
4	DISTVERSION= 2.8.6	4	DISTVERSION= 2.8.6
		5	PORTREVISION= 1
5	CATEGORIES= sysutils python	6	CATEGORIES= sysutils python
6	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
7		8
Lines 17-22 Link Here
17	google_oslogin_control:sysutils/google-compute-engine-oslogin \	18	google_oslogin_control:sysutils/google-compute-engine-oslogin \
18	sudo:security/sudo	19	sudo:security/sudo
19		20
		21	.if ${FLAVOR:Upy36:Mpy3*}
		22	RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}distro>0:sysutils/py-distro@${PY_FLAVOR}
		23	.endif
		24
20	USES= python shebangfix	25	USES= python shebangfix
21	USE_PYTHON= autoplist concurrent distutils	26	USE_PYTHON= autoplist concurrent distutils
22		27




--- 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':

Return to bug 237203

Line 0 Link Here

(-)py-google-compute-engine/files/patch-google__compute__engine_compat.py (+23 lines)
	1	--- google_compute_engine/compat.py.orig 2018-10-11 16:53:23 UTC
	2	+++ google_compute_engine/compat.py
	3	@@ -25,11 +25,17 @@ else:
	4	import platform as distro
	5
	6	if 'freebsd' in sys.platform:
	7	- distribution = distro.version().split()
	8	+ # Note: Do not use .version() method which is from either platform or distro
	9	+ # platform.version() and distro.version() return different values.
	10	+ # platform.version() returns 'FreeBSD 11.2-RELEASE-p9.....'
	11	+ # distro.version() returns '11.2'
	12	+ distro_name = 'freebsd'
	13	+ # distro_version is not used for FreeBSD later in this code
	14	+ distro_version = None
	15	else:
	16	distribution = distro.linux_distribution()
	17	-distro_name = distribution[0].lower()
	18	-distro_version = distribution[1].split('.')[0]
	19	+ distro_name = distribution[0].lower()
	20	+ distro_version = distribution[1].split('.')[0]
	21	distro_utils = None
	22
	23	if 'centos' in distro_name and distro_version == '6':