Attachment #231479 for bug #261642

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

Lines 28-38 PATH=$PATH:$base_dir Link Here

(-)b/gclient (-3 / +3 lines)
28		28
29	if [[ $GCLIENT_PY3 == 1 ]]; then	29	if [[ $GCLIENT_PY3 == 1 ]]; then
30	# Explicitly run on Python 3	30	# Explicitly run on Python 3
31	PYTHONDONTWRITEBYTECODE=1 exec vpython3 "$base_dir/gclient.py" "$@"	31	PYTHONDONTWRITEBYTECODE=1 exec python3 "$base_dir/gclient.py" "$@"
32	elif [[ $GCLIENT_PY3 == 0 ]]; then	32	elif [[ $GCLIENT_PY3 == 0 ]]; then
33	# Explicitly run on Python 2	33	# Explicitly run on Python 2
34	PYTHONDONTWRITEBYTECODE=1 exec vpython "$base_dir/gclient.py" "$@"	34	PYTHONDONTWRITEBYTECODE=1 exec python "$base_dir/gclient.py" "$@"
35	else	35	else
36	# Run on Python 3, allows default to be flipped.	36	# Run on Python 3, allows default to be flipped.
37	PYTHONDONTWRITEBYTECODE=1 exec vpython3 "$base_dir/gclient.py" "$@"	37	PYTHONDONTWRITEBYTECODE=1 exec python3 "$base_dir/gclient.py" "$@"
38	fi	38	fi

Lines 1277-1282 _PLATFORM_MAPPING = { Link Here

(-)b/gclient.py (+1 lines)
1277	'linux': 'linux',	1277	'linux': 'linux',
1278	'win32': 'win',	1278	'win32': 'win',
1279	'aix6': 'aix',	1279	'aix6': 'aix',
		1280	'freebsd' : 'freebsd',
1280	}	1281	}
1281		1282
1282		1283

Lines 748-753 def GetMacWinAixOrLinux(): Link Here

(-)b/gclient_utils.py (+2 lines)
748	return 'mac'	748	return 'mac'
749	elif sys.platform.startswith('aix'):	749	elif sys.platform.startswith('aix'):
750	return 'aix'	750	return 'aix'
		751	elif sys.platform.startswith('freebsd'):
		752	return 'freebsd'
751	raise Error('Unknown platform: ' + sys.platform)	753	raise Error('Unknown platform: ' + sys.platform)
752		754
753		755

Return to bug 261642