Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61fb560f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libsparse: no xrange() in python3." am: 59171962 am: 210a1c49 am:... 

Merge "libsparse: no xrange() in python3." am: 59171962 am: 210a1c49 am: 13164d04 am: 7d2aae3a

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1953698

Change-Id: Iddfdc46373117e82760d3e96e62e1df9f7500cd0
parents fcba8786 7d2aae3a

libsparse/simg_dump.py

+2 −2
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ def main(): 
                          "output offset", "output blocks", "type", "hash"])



    offset = 0

    for i in xrange(1, total_chunks + 1):

    for i in range(1, total_chunks + 1):

      header_bin = FH.read(12)

      header = struct.unpack("<2H2I", header_bin)

      chunk_type = header[0]
@@ -159,7 +159,7 @@ def main(): 
          if showhash:

            h = hashlib.sha1()

            data = fill_bin * (blk_sz / 4);

            for block in xrange(chunk_sz):

            for block in range(chunk_sz):

              h.update(data)

            curhash = h.hexdigest()

      elif chunk_type == 0xCAC3: