StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

releasetools: Make scripts pylint clean.

Browse Source 
Clean up the following scripts.
  blockimgdiff.py
  common.py
  edify_generator.py
  img_from_target_files.py
  ota_from_target_files.py

Seems we don't have a way to force pylint-ing the scripts using
per-directory pylintrc files (and we don't have pylint tool in AOSP
repo), per
https://android.googlesource.com/platform/tools/repohooks/#todo_limitations.

Test: `m dist`
Test: pylint --rcfile=pylintrc <script.py>
Change-Id: Ia6fd1ddc86f4d84c68e500f225d4a89d0fea8ec7
This commit is contained in:
Tao Bao
2017-11-21 09:25:31 -08:00
parent 401fada3f5
commit 76def243ec
6 changed files with 126 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/releasetools/ota_from_target_files.py
View File

@@ -833,7 +833,8 @@ else if get_stage("%(bcb_dev)s") == "3/3" then
allow_shared_blocks)
system_tgt.ResetFileMap()
system_diff = common.BlockDifference("system", system_tgt, src=None)
system_diff.WriteScript(script, output_zip)
system_diff.WriteScript(script, output_zip,
write_verify_script=OPTIONS.verify)
boot_img = common.GetBootableImage(
"boot.img", "boot.img", OPTIONS.input_tmp, "BOOT")
@@ -845,7 +846,8 @@ else if get_stage("%(bcb_dev)s") == "3/3" then
allow_shared_blocks)
vendor_tgt.ResetFileMap()
vendor_diff = common.BlockDifference("vendor", vendor_tgt)
vendor_diff.WriteScript(script, output_zip)
vendor_diff.WriteScript(script, output_zip,
write_verify_script=OPTIONS.verify)
AddCompatibilityArchiveIfTrebleEnabled(input_zip, output_zip, target_info)
@@ -1565,10 +1567,12 @@ else
device_specific.IncrementalOTA_InstallBegin()
system_diff.WriteScript(script, output_zip,
progress=0.8 if vendor_diff else 0.9)
progress=0.8 if vendor_diff else 0.9,
write_verify_script=OPTIONS.verify)
if vendor_diff:
vendor_diff.WriteScript(script, output_zip, progress=0.1)
vendor_diff.WriteScript(script, output_zip, progress=0.1,
write_verify_script=OPTIONS.verify)
if OPTIONS.two_step:
common.ZipWriteStr(output_zip, "boot.img", target_boot.data)