aboutsummaryrefslogtreecommitdiff
path: root/contrib/linearize/linearize-data.py
diff options
context:
space:
mode:
authorTim Akinbo <[email protected]>2019-09-04 07:07:14 +0000
committerTim Akinbo <[email protected]>2019-09-30 18:10:47 +0000
commit3284e6c09a84e9557ec72723ad636053d3ef7122 (patch)
tree34ce4dcb8a2436212072333dab0c14ad1a1ba47e /contrib/linearize/linearize-data.py
parentMerge #16745: wallet: Translate all initErrors in CreateWalletFromFile (diff)
downloaddiscoin-3284e6c09a84e9557ec72723ad636053d3ef7122.tar.xz
discoin-3284e6c09a84e9557ec72723ad636053d3ef7122.zip
scripts: search for next position of magic bytes rather than fail
document seek method for next position of magic bytes
Diffstat (limited to 'contrib/linearize/linearize-data.py')
-rwxr-xr-xcontrib/linearize/linearize-data.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/contrib/linearize/linearize-data.py b/contrib/linearize/linearize-data.py
index 468aec04b..e0718f107 100755
--- a/contrib/linearize/linearize-data.py
+++ b/contrib/linearize/linearize-data.py
@@ -213,8 +213,11 @@ class BlockDataCopier:
inMagic = inhdr[:4]
if (inMagic != self.settings['netmagic']):
- print("Invalid magic: " + inMagic.hex())
- return
+ # Seek backwards 7 bytes (skipping the first byte in the previous search)
+ # and continue searching from the new position if the magic bytes are not
+ # found.
+ self.inF.seek(-7, os.SEEK_CUR)
+ continue
inLenLE = inhdr[4:]
su = struct.unpack("<I", inLenLE)
inLen = su[0] - 80 # length without header