зеркало из https://github.com/mozilla/gecko-dev.git
Bug 841935: Use sys.executable to invoke b2g update scripts. r=jgriffin a=tef+
This commit is contained in:
Родитель
412b3afdba
Коммит
7d75ca61d8
|
@ -135,7 +135,7 @@ class SmokeTestRunner(object):
|
||||||
if not os.path.exists(partial_mar):
|
if not os.path.exists(partial_mar):
|
||||||
build_gecko_mar = os.path.join(self.b2g.update_tools,
|
build_gecko_mar = os.path.join(self.b2g.update_tools,
|
||||||
'build-gecko-mar.py')
|
'build-gecko-mar.py')
|
||||||
subprocess.check_call([build_gecko_mar,
|
subprocess.check_call([sys.executable, build_gecko_mar,
|
||||||
'--from', start_data.complete_mar,
|
'--from', start_data.complete_mar,
|
||||||
'--to', finish_data.complete_mar,
|
'--to', finish_data.complete_mar,
|
||||||
partial_mar])
|
partial_mar])
|
||||||
|
|
|
@ -50,7 +50,7 @@ def stage_update(device, stage_dir):
|
||||||
print 'Building flash zip for device %s, version %s, build %s...' % \
|
print 'Building flash zip for device %s, version %s, build %s...' % \
|
||||||
(device, app_version, build_id)
|
(device, app_version, build_id)
|
||||||
|
|
||||||
subprocess.check_call([build_flash_fota,
|
subprocess.check_call([sys.executable, build_flash_fota,
|
||||||
'--system-dir', os.path.join(target_out_dir, 'system'),
|
'--system-dir', os.path.join(target_out_dir, 'system'),
|
||||||
'--system-fs-type', device_data.system_fs_type,
|
'--system-fs-type', device_data.system_fs_type,
|
||||||
'--system-location', device_data.system_location,
|
'--system-location', device_data.system_location,
|
||||||
|
|
Загрузка…
Ссылка в новой задаче