@@ -647,7 +647,7 @@ def _get(section_dict, key, default=None):
647647__version_date__ = str(__version_date_info__[0]) + "." + str(
648648 __version_date_info__[1]).zfill(2) + "." + str(__version_date_info__[2]).zfill(2)
649649__revision__ = __version_info__[3]
650- __revision_id__ = "$Id$"
650+ __revision_id__ = "$Id: ac98f2d8fa689bbcf7939f892030aad675a7d5fe $"
651651if(__version_info__[4] is not None):
652652 __version_date_plusrc__ = __version_date__ + \
653653 "-" + str(__version_date_info__[4])
@@ -10138,7 +10138,7 @@ def _add(cat, name, fid):
1013810138 return out
1013910139
1014010140
10141- def RePackArchiveFile(infile, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=None , followlink=False, filestart=0, seekstart=0, seekend=0, checksumtype=None, skipchecksum=False, extradata=None , jsondata=None , formatspecs=None, seektoend=False, verbose=False, returnfp=False):
10141+ def RePackArchiveFile(infile, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt , followlink=False, filestart=0, seekstart=0, seekend=0, checksumtype=["md5", "md5", "md5", "md5", "md5"], skipchecksum=False, extradata=[] , jsondata={} , formatspecs=None, seektoend=False, verbose=False, returnfp=False):
1014210142 # ---------- Safe defaults ----------
1014310143 if compressionuselist is None:
1014410144 compressionuselist = compressionlistalt
@@ -10244,7 +10244,7 @@ def RePackArchiveFile(infile, outfile, fmttype="auto", compression="auto", compr
1024410244 if lenlist != fnumfiles:
1024510245 fnumfiles = lenlist
1024610246
10247- AppendFileHeader(fp, fnumfiles, listarrayfiles.get('fencoding', 'utf-8'), [ ], checksumtype[0], formatspecs)
10247+ AppendFileHeader(fp, fnumfiles, listarrayfiles.get('fencoding', 'utf-8'), listarrayfiles['fextradata' ], listarrayfiles['fjsondata'], [ checksumtype[0], checksumtype[1] ], formatspecs)
1024810248
1024910249 # loop counters
1025010250 lcfi = 0
@@ -10435,7 +10435,7 @@ def RePackArchiveFile(infile, outfile, fmttype="auto", compression="auto", compr
1043510435
1043610436 AppendFileHeaderWithContent(
1043710437 fp, tmpoutlist, extradata, jsondata, fcontents.read(),
10438- [checksumtype[1 ], checksumtype[2 ], checksumtype[3 ]], formatspecs
10438+ [checksumtype[2 ], checksumtype[3 ], checksumtype[4 ]], formatspecs
1043910439 )
1044010440 try:
1044110441 fcontents.close()
@@ -10481,7 +10481,7 @@ def RePackArchiveFile(infile, outfile, fmttype="auto", compression="auto", compr
1048110481 pass
1048210482 return True
1048310483
10484- def RePackMultipleArchiveFile(infiles, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=None , followlink=False, filestart=0, seekstart=0, seekend=0, checksumtype=None, skipchecksum=False, extradata=None , jsondata=None , formatspecs=None, seektoend=False, verbose=False, returnfp=False):
10484+ def RePackMultipleArchiveFile(infiles, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt , followlink=False, filestart=0, seekstart=0, seekend=0, checksumtype=["md5", "md5", "md5", "md5", "md5"], skipchecksum=False, extradata=[] , jsondata={} , formatspecs=None, seektoend=False, verbose=False, returnfp=False):
1048510485 if not isinstance(infiles, list):
1048610486 infiles = [infiles]
1048710487 returnout = False
@@ -10496,14 +10496,14 @@ def RePackMultipleArchiveFile(infiles, outfile, fmttype="auto", compression="aut
1049610496 return True
1049710497 return returnout
1049810498
10499- def RePackArchiveFileFromString(instr, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, followlink=False, filestart=0, seekstart=0, seekend=0, checksumtype=["md5", "md5", "md5"], skipchecksum=False, extradata=[], jsondata={}, formatspecs=__file_format_dict__ , seektoend=False, verbose=False, returnfp=False):
10499+ def RePackArchiveFileFromString(instr, outfile, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, followlink=False, filestart=0, seekstart=0, seekend=0, checksumtype=["md5", "md5", "md5", "md5", "md5" ], skipchecksum=False, extradata=[], jsondata={}, formatspecs=None , seektoend=False, verbose=False, returnfp=False):
1050010500 fp = MkTempFile(instr)
1050110501 listarrayfiles = RePackArchiveFile(fp, outfile, fmttype, compression, compresswholefile, compressionlevel, compressionuselist, followlink, filestart, seekstart, seekend,
1050210502 checksumtype, skipchecksum, extradata, jsondata, formatspecs, seektoend, verbose, returnfp)
1050310503 return listarrayfiles
1050410504
1050510505
10506- def PackArchiveFileFromListDir(infiles, outfile, dirlistfromtxt=False, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, followlink=False, filestart=0, seekstart=0, seekend=0, checksumtype=["md5", "md5", "md5"], skipchecksum=False, extradata=[], jsondata={}, formatspecs=__file_format_dict__, seektoend=False, verbose=False, returnfp=False):
10506+ def PackArchiveFileFromListDir(infiles, outfile, dirlistfromtxt=False, fmttype="auto", compression="auto", compresswholefile=True, compressionlevel=None, compressionuselist=compressionlistalt, followlink=False, filestart=0, seekstart=0, seekend=0, checksumtype=["md5", "md5", "md5", "md5", "md5" ], skipchecksum=False, extradata=[], jsondata={}, formatspecs=__file_format_dict__, seektoend=False, verbose=False, returnfp=False):
1050710507 outarray = MkTempFile()
1050810508 packform = PackArchiveFile(infiles, outarray, dirlistfromtxt, fmttype, compression, compresswholefile,
1050910509 compressionlevel, compressionuselist, followlink, checksumtype, extradata, formatspecs, verbose, True)
0 commit comments