aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2014-12-11 16:33:20 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2014-12-11 16:33:27 +0100
commit3bb29a3e13f78f534d96b71048a128843f3bab85 (patch)
tree8e821899bcf3e4901bae6c79e76b386c18b2b924 /contrib
parentdcc1304426ae4859c05d32364b8fd9e5c03d7408 (diff)
parentebdd6bf30f2feaeeeaa168d6f70b9f48acb22a90 (diff)
downloadbitcoin-3bb29a3e13f78f534d96b71048a128843f3bab85.tar.xz
Merge pull request #5440
ebdd6bf Remove genesis block hash from error (Micha) 8d174d6 Make several small string fixes in linearize-data.py (Micha)
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/linearize/linearize-data.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/linearize/linearize-data.py b/contrib/linearize/linearize-data.py
index 2dac3a614b..f59fe9f6e7 100755
--- a/contrib/linearize/linearize-data.py
+++ b/contrib/linearize/linearize-data.py
@@ -148,7 +148,7 @@ class BlockDataCopier:
outFname = self.settings['output_file']
else:
outFname = "%s/blk%05d.dat" % (self.settings['output'], outFn)
- print("Output file" + outFname)
+ print("Output file " + outFname)
self.outF = open(outFname, "wb")
self.outF.write(inhdr)
@@ -189,7 +189,7 @@ class BlockDataCopier:
while self.blkCountOut < len(self.blkindex):
if not self.inF:
fname = self.inFileName(self.inFn)
- print("Input file" + fname)
+ print("Input file " + fname)
try:
self.inF = open(fname, "rb")
except IOError:
@@ -205,7 +205,7 @@ class BlockDataCopier:
inMagic = inhdr[:4]
if (inMagic != self.settings['netmagic']):
- print("Invalid magic:" + inMagic)
+ print("Invalid magic: " + inMagic)
return
inLenLE = inhdr[4:]
su = struct.unpack("<I", inLenLE)
@@ -292,7 +292,7 @@ if __name__ == '__main__':
blkmap = mkblockmap(blkindex)
if not "000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f" in blkmap:
- print("not found")
+ print("Genesis block not found in hashlist")
else:
BlockDataCopier(settings, blkindex, blkmap).run()