@@ -154,7 +154,7 @@ def handler(signum, frame):
154154 checkcompressfile = pyarchivefile .CheckCompressionSubType (
155155 input_file , fnamedict , 0 , True )
156156 if ((pyarchivefile .IsNestedDict (fnamedict ) and checkcompressfile in fnamedict ) or (pyarchivefile .IsSingleDict (fnamedict ) and checkcompressfile == fnamedict ['format_magic' ])):
157- tmpout = pyarchivefile .RePackArchiveFile (input_file , getargs .output , "auto" , getargs .compression , getargs .wholefile , getargs .level , pyarchivefile .compressionlistalt , False , 0 , 0 , 0 , [getargs .checksum , getargs .checksum , getargs .checksum , getargs .checksum , getargs .checksum ], getargs .skipchecksum , [], {}, fnamedict , getargs .secretkey , getargs .verbose , False )
157+ tmpout = pyarchivefile .RePackArchiveFile (input_file , getargs .output , "auto" , getargs .compression , getargs .wholefile , getargs .level , pyarchivefile .compressionlistalt , False , 0 , 0 , 0 , [getargs .checksum , getargs .checksum , getargs .checksum , getargs .checksum , getargs .checksum ], getargs .skipchecksum , [], {}, fnamedict , getargs .secretkey , getargs .secretkey , getargs . verbose , False )
158158 else :
159159 tmpout = pyarchivefile .PackArchiveFileFromInFile (
160160 input_file , getargs .output , __file_format_default__ , getargs .compression , getargs .wholefile , getargs .level , pyarchivefile .compressionlistalt , [getargs .checksum , getargs .checksum , getargs .checksum , getargs .checksum , getargs .checksum ], [], {}, fnamedict , getargs .secretkey , getargs .verbose , False )
@@ -168,21 +168,21 @@ def handler(signum, frame):
168168 input_file , fnamedict , 0 , True )
169169 if ((pyarchivefile .IsNestedDict (fnamedict ) and checkcompressfile in fnamedict ) or (pyarchivefile .IsSingleDict (fnamedict ) and checkcompressfile == fnamedict ['format_magic' ])):
170170 pyarchivefile .RePackArchiveFile (input_file , getargs .output , "auto" , getargs .compression , getargs .wholefile , getargs .level , pyarchivefile .compressionlistalt ,
171- False , 0 , 0 , 0 , [getargs .checksum , getargs .checksum , getargs .checksum , getargs .checksum , getargs .checksum ], getargs .skipchecksum , [], {}, fnamedict , getargs .secretkey , getargs .verbose , False )
171+ False , 0 , 0 , 0 , [getargs .checksum , getargs .checksum , getargs .checksum , getargs .checksum , getargs .checksum ], getargs .skipchecksum , [], {}, fnamedict , getargs .secretkey , getargs .secretkey , getargs . verbose , False )
172172 else :
173173 pyarchivefile .PackArchiveFileFromInFile (input_file , getargs .output , __file_format_default__ , getargs .compression , getargs .wholefile , getargs .level , pyarchivefile .compressionlistalt , [getargs .checksum , getargs .checksum , getargs .checksum , getargs .checksum , getargs .checksum ], [], {}, fnamedict , getargs .secretkey , getargs .verbose , False )
174174 if (not tmpout ):
175175 sys .exit (1 )
176176 else :
177177 pyarchivefile .RePackArchiveFile (input_file , getargs .output , "auto" , getargs .compression , getargs .wholefile , getargs .level , pyarchivefile .compressionlistalt ,
178- False , getargs .filestart , 0 , 0 , [getargs .checksum , getargs .checksum , getargs .checksum , getargs .checksum , getargs .checksum ], getargs .skipchecksum , [], {}, fnamedict , getargs .secretkey , getargs .verbose , False )
178+ False , getargs .filestart , 0 , 0 , [getargs .checksum , getargs .checksum , getargs .checksum , getargs .checksum , getargs .checksum ], getargs .skipchecksum , [], {}, fnamedict , getargs .secretkey , getargs .secretkey , getargs . verbose , False )
179179 elif active_action == 'extract' :
180180 if getargs .convert :
181181 checkcompressfile = pyarchivefile .CheckCompressionSubType (
182182 input_file , fnamedict , 0 , True )
183183 tempout = BytesIO ()
184184 if ((pyarchivefile .IsNestedDict (fnamedict ) and checkcompressfile in fnamedict ) or (pyarchivefile .IsSingleDict (fnamedict ) and checkcompressfile == fnamedict ['format_magic' ])):
185- tmpout = pyarchivefile .RePackArchiveFile (input_file , tempout , "auto" , getargs .compression , getargs .wholefile , getargs .level , pyarchivefile .compressionlistalt , False , 0 , 0 , 0 , [getargs .checksum , getargs .checksum , getargs .checksum , getargs .checksum , getargs .checksum ], getargs .skipchecksum , [], {}, fnamedict , getargs .secretkey , False , False )
185+ tmpout = pyarchivefile .RePackArchiveFile (input_file , tempout , "auto" , getargs .compression , getargs .wholefile , getargs .level , pyarchivefile .compressionlistalt , False , 0 , 0 , 0 , [getargs .checksum , getargs .checksum , getargs .checksum , getargs .checksum , getargs .checksum ], getargs .skipchecksum , [], {}, fnamedict , getargs .secretkey , getargs . secretkey , False , False )
186186 else :
187187 tmpout = pyarchivefile .PackArchiveFileFromInFile (
188188 input_file , tempout , __file_format_default__ , getargs .compression , getargs .wholefile , getargs .level , pyarchivefile .compressionlistalt , [getargs .checksum , getargs .checksum , getargs .checksum , getargs .checksum , getargs .checksum ], [], {}, fnamedict , getargs .secretkey , False , False )
@@ -209,7 +209,7 @@ def handler(signum, frame):
209209 input_file , fnamedict , 0 , True )
210210 tempout = BytesIO ()
211211 if ((pyarchivefile .IsNestedDict (fnamedict ) and checkcompressfile in fnamedict ) or (pyarchivefile .IsSingleDict (fnamedict ) and checkcompressfile == fnamedict ['format_magic' ])):
212- tmpout = pyarchivefile .RePackArchiveFile (input_file , tempout , "auto" , getargs .compression , getargs .wholefile , getargs .level , pyarchivefile .compressionlistalt , False , 0 , 0 , 0 , [getargs .checksum , getargs .checksum , getargs .checksum , getargs .checksum , getargs .checksum ], getargs .skipchecksum , [], {}, fnamedict , getargs .secretkey , False , False , False )
212+ tmpout = pyarchivefile .RePackArchiveFile (input_file , tempout , "auto" , getargs .compression , getargs .wholefile , getargs .level , pyarchivefile .compressionlistalt , False , 0 , 0 , 0 , [getargs .checksum , getargs .checksum , getargs .checksum , getargs .checksum , getargs .checksum ], getargs .skipchecksum , [], {}, fnamedict , getargs .secretkey , getargs . secretkey , False , False , False )
213213 else :
214214 tmpout = pyarchivefile .PackArchiveFileFromInFile (
215215 input_file , tempout , __file_format_default__ , getargs .compression , getargs .wholefile , getargs .level , pyarchivefile .compressionlistalt , [getargs .checksum , getargs .checksum , getargs .checksum , getargs .checksum , getargs .checksum ], [], {}, fnamedict , getargs .secretkey , False , False )
0 commit comments