commit 8787cd6d4ec9e403557e17d6083bb180874fc08c
author Tao Bao <tbao@google.com> Wed Jul 01 17:44:53 2015 -0700
committer Tao Bao <tbao@google.com> Wed Jul 01 17:44:53 2015 -0700
tree 248ea52d917669135d7df4b52de782c0015a1aa8
parent 78d1cba0f42d023483e64d5c7b6f9e1c8b236ed4
parent 7f9470cda390ee61c0fc71491d0c649fbf6e02dd

resolved conflicts for merge of 7f9470cd to lmp-mr1-ub-dev

Change-Id: Icfc94fcc4178f5fbfad62df9914c84d59d140bb7

tools/releasetools/sparse_img.py

diff --git a/tools/releasetools/sparse_img.py b/tools/releasetools/sparse_img.py
index b97bb84..78f3057 100644
--- a/tools/releasetools/sparse_img.py
+++ b/tools/releasetools/sparse_img.py
@@ -201,8 +201,12 @@
           nonzero_blocks.append(b)
           nonzero_blocks.append(b+1)
 
-    out["__ZERO"] = rangelib.RangeSet(data=zero_blocks)
-    out["__NONZERO"] = rangelib.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