commit 5df6b5c3463bc8715510320beb7833c45371e021
author Tao Bao <tbao@google.com> Sat Jun 27 16:37:39 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Jun 27 16:37:40 2015 +0000
tree e7c2c2f2773e51a212b7139a62b0bb727862e65f
parent c94a705f445aa7edc2a30b364b59fe8becb02f11
parent a89781204efb6d839e5d03d94725d3db362b5037

Merge "sparse_img.py: Don't write empty map groups."

tools/releasetools/sparse_img.py

diff --git a/tools/releasetools/sparse_img.py b/tools/releasetools/sparse_img.py
index 49b3a67..7019f00 100644
--- a/tools/releasetools/sparse_img.py
+++ b/tools/releasetools/sparse_img.py
@@ -221,9 +221,14 @@
           nonzero_blocks.append(b)
           nonzero_blocks.append(b+1)
 
-    out["__ZERO"] = rangelib.RangeSet(data=zero_blocks)
-    out["__NONZERO"] = rangelib.RangeSet(data=nonzero_blocks)
-    out["__COPY"] = clobbered_blocks
+    assert zero_blocks or nonzero_blocks or clobbered_blocks
+
+    if zero_blocks:
+      out["__ZERO"] = rangelib.RangeSet(data=zero_blocks)
+    if nonzero_blocks:
+      out["__NONZERO"] = rangelib.RangeSet(data=nonzero_blocks)
+    if clobbered_blocks:
+      out["__COPY"] = clobbered_blocks
 
   def ResetFileMap(self):
     """Throw away the file map and treat the entire image as