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

Merge "Exclude holes from the block map." am: 9581181338 am: 4969b45d50

Browse Source 
Change-Id: Idf4cf41cdcf58dcb0a905b2082ae6255fea26002
This commit is contained in:
Automerger Merge Worker
2020-02-21 17:43:17 +00:00
parent 19c6758950 4969b45d50
commit de72054e03
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/releasetools/sparse_img.py
View File

@@ -251,6 +251,12 @@ class SparseImage(object):
for line in f: for line in f:
fn, ranges_text = line.rstrip().split(None, 1) fn, ranges_text = line.rstrip().split(None, 1)
ranges = rangelib.RangeSet.parse(ranges_text) ranges = rangelib.RangeSet.parse(ranges_text)
# Note: e2fsdroid records holes in the extent tree as "0" blocks.
# This causes confusion because clobbered_blocks always includes
# the superblock (physical block #0). Since the 0 blocks here do
# not represent actual physical blocks, remove them from the set.
ranges = ranges.subtract(rangelib.RangeSet("0"))
ranges.extra['text_str'] = ranges_text ranges.extra['text_str'] = ranges_text
if allow_shared_blocks: if allow_shared_blocks: