Skip to content

Commit feb98a9

Browse files
author
Kazuki Suzuki Przyborowski
committed
Update pyarchivefile.py
1 parent bb274ad commit feb98a9

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

pyarchivefile.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3342,7 +3342,7 @@ def AppendFileHeaderWithContent(fp, filevalues=[], extradata=[], jsondata={}, fi
33423342
if(len(filecontent) == 0):
33433343
checksumlist = [checksumtype[0], "none"]
33443344
else:
3345-
checksumlist = checksumtype
3345+
checksumlist = [checksumtype[0], checksumtype[1]]
33463346
outfileoutstr = outfileoutstr + \
33473347
AppendNullBytes(checksumlist, formatspecs['format_delimiter'])
33483348
nullstrecd = formatspecs['format_delimiter'].encode('UTF-8')
@@ -7268,18 +7268,18 @@ def ArchiveFileValidate(infile, fmttype="auto", formatspecs=__file_format_multi_
72687268
valid_archive = False
72697269
invalid_archive = True
72707270
if(outfjsonsize > 0):
7271-
if(outfcs == infcs):
7271+
if(outfjsonchecksum == injsonfcs):
72727272
if(verbose):
72737273
VerbosePrintOut(
72747274
"File JSON Data Checksum Passed at offset " + str(outfjstart))
7275-
VerbosePrintOut("'" + outfcs + "' == " +
7276-
"'" + infcs + "'")
7275+
VerbosePrintOut("'" + outfjsonchecksum + "' == " +
7276+
"'" + injsonfcs + "'")
72777277
else:
72787278
if(verbose):
72797279
VerbosePrintOut(
72807280
"File JSON Data Checksum Error at offset " + str(outfjstart))
7281-
VerbosePrintOut("'" + outfcs + "' != " +
7282-
"'" + infcs + "'")
7281+
VerbosePrintOut("'" + outfjsonchecksum + "' != " +
7282+
"'" + injsonfcs + "'")
72837283
valid_archive = False
72847284
invalid_archive = True
72857285
outfcontentstart = fp.tell()

0 commit comments

Comments
 (0)