From 7f9470cda390ee61c0fc71491d0c649fbf6e02dd Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Fri, 26 Jun 2015 17:49:39 -0700 Subject: [PATCH] sparse_img.py: Don't write empty map groups. In certain cases, we may have no mapping of ZERO or NONZERO blocks in the image (such as squashfs at the moment). Don't write those groups if they are empty. Change-Id: I82aa05fbbd79130b08868585edd5298e531c4f5a --- tools/releasetools/sparse_img.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/releasetools/sparse_img.py b/tools/releasetools/sparse_img.py index 7574747f5d..59d2b71f89 100644 --- a/tools/releasetools/sparse_img.py +++ b/tools/releasetools/sparse_img.py @@ -204,8 +204,12 @@ class SparseImage(object): nonzero_blocks.append(b) nonzero_blocks.append(b+1) - out["__ZERO"] = RangeSet(data=zero_blocks) - out["__NONZERO"] = RangeSet(data=nonzero_blocks) + assert zero_blocks or nonzero_blocks + + if zero_blocks: + out["__ZERO"] = rangelib.RangeSet(data=zero_blocks) + if nonzero_blocks: + out["__NONZERO"] = rangelib.RangeSet(data=nonzero_blocks) def ResetFileMap(self): """Throw away the file map and treat the entire image as