mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-03-17 21:32:00 +01:00
Merge e9dc16194b47921ea6c5453e71c5c97b9232ba8c into 5f4422d68dc3530c353af1f87499de1c864b60ad
This commit is contained in:
commit
66d7843015
@ -134,6 +134,7 @@ class BlockDataCopier:
|
|||||||
def writeBlock(self, inhdr, blk_hdr, rawblock):
|
def writeBlock(self, inhdr, blk_hdr, rawblock):
|
||||||
blockSizeOnDisk = len(inhdr) + len(blk_hdr) + len(rawblock)
|
blockSizeOnDisk = len(inhdr) + len(blk_hdr) + len(rawblock)
|
||||||
if not self.fileOutput and ((self.outsz + blockSizeOnDisk) > self.maxOutSz):
|
if not self.fileOutput and ((self.outsz + blockSizeOnDisk) > self.maxOutSz):
|
||||||
|
os.ftruncate(self.outF.fileno(), self.outF.tell())
|
||||||
self.outF.close()
|
self.outF.close()
|
||||||
if self.setFileTime:
|
if self.setFileTime:
|
||||||
os.utime(self.outFname, (int(time.time()), self.highTS))
|
os.utime(self.outFname, (int(time.time()), self.highTS))
|
||||||
@ -147,6 +148,7 @@ class BlockDataCopier:
|
|||||||
print("New month " + blkDate.strftime("%Y-%m") + " @ " + self.hash_str)
|
print("New month " + blkDate.strftime("%Y-%m") + " @ " + self.hash_str)
|
||||||
self.lastDate = blkDate
|
self.lastDate = blkDate
|
||||||
if self.outF:
|
if self.outF:
|
||||||
|
os.ftruncate(self.outF.fileno(), self.outF.tell())
|
||||||
self.outF.close()
|
self.outF.close()
|
||||||
if self.setFileTime:
|
if self.setFileTime:
|
||||||
os.utime(self.outFname, (int(time.time()), self.highTS))
|
os.utime(self.outFname, (int(time.time()), self.highTS))
|
||||||
@ -161,7 +163,10 @@ class BlockDataCopier:
|
|||||||
else:
|
else:
|
||||||
self.outFname = os.path.join(self.settings['output'], "blk%05d.dat" % self.outFn)
|
self.outFname = os.path.join(self.settings['output'], "blk%05d.dat" % self.outFn)
|
||||||
print("Output file " + self.outFname)
|
print("Output file " + self.outFname)
|
||||||
self.outF = open(self.outFname, "wb")
|
try:
|
||||||
|
self.outF = open(self.outFname, "xb+")
|
||||||
|
except FileExistsError:
|
||||||
|
self.outF = open(self.outFname, "rb+")
|
||||||
|
|
||||||
self.outF.write(inhdr)
|
self.outF.write(inhdr)
|
||||||
self.outF.write(blk_hdr)
|
self.outF.write(blk_hdr)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user