Skip to content

Commit 33d9a1c

Browse files
author
Kazuki Suzuki Przyborowski
committed
Update pycatfile.py
1 parent 9f7dadd commit 33d9a1c

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

pycatfile.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3354,7 +3354,7 @@ def AppendFileHeaderWithContent(fp, filevalues=[], extradata=[], jsondata={}, fi
33543354
if(len(filecontent) == 0):
33553355
checksumlist = [checksumtype[0], "none"]
33563356
else:
3357-
checksumlist = checksumtype
3357+
checksumlist = [checksumtype[0], checksumtype[1]]
33583358
outfileoutstr = outfileoutstr + \
33593359
AppendNullBytes(checksumlist, formatspecs['format_delimiter'])
33603360
nullstrecd = formatspecs['format_delimiter'].encode('UTF-8')
@@ -7280,18 +7280,18 @@ def CatFileValidate(infile, fmttype="auto", formatspecs=__file_format_multi_dict
72807280
valid_archive = False
72817281
invalid_archive = True
72827282
if(outfjsonsize > 0):
7283-
if(outfcs == infcs):
7283+
if(outfjsonchecksum == injsonfcs):
72847284
if(verbose):
72857285
VerbosePrintOut(
72867286
"File JSON Data Checksum Passed at offset " + str(outfjstart))
7287-
VerbosePrintOut("'" + outfcs + "' == " +
7288-
"'" + infcs + "'")
7287+
VerbosePrintOut("'" + outfjsonchecksum + "' == " +
7288+
"'" + injsonfcs + "'")
72897289
else:
72907290
if(verbose):
72917291
VerbosePrintOut(
72927292
"File JSON Data Checksum Error at offset " + str(outfjstart))
7293-
VerbosePrintOut("'" + outfcs + "' != " +
7294-
"'" + infcs + "'")
7293+
VerbosePrintOut("'" + outfjsonchecksum + "' != " +
7294+
"'" + injsonfcs + "'")
72957295
valid_archive = False
72967296
invalid_archive = True
72977297
outfcontentstart = fp.tell()

0 commit comments

Comments
 (0)