Skip to content

Commit

Permalink
Make call to extractAll() function behave as call to extract() (#16)
Browse files Browse the repository at this point in the history
The call to the `extractAll` function seems to make a semantically
incorrect usage of `args.srcFiles[0]`.  The `extract` function uses
`arg.folder` as an output specifier, and `args.srcFiles` as an input
specifier.  `extractAll` should drop input parameters.

This patch modifies the `extractAll` call to use `args.folder` to
specify output.  However, this may cause backwards-incompatible changes
with any scripts that use `--extract-all`, so this should wait for the
next major version (keeping with SemVer called for in Issue 8).
#8

This patch is independent of Pull Request 14.
#14

Signed-off-by: Alex Nelson <[email protected]>
  • Loading branch information
ajnelson-nist authored and blschatz committed Oct 21, 2019
1 parent 542d645 commit 20f2c51
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion aff4.py
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ def main(argv):
extract(dest, args.srcFiles, args.folder)
elif args.extract_all == True:
dest = args.aff4container
extractAll(dest, args.srcFiles[0])
extractAll(dest, args.folder)
elif args.ingest == True:
dest = args.aff4container
ingestZipfile(dest, args.srcFiles, False, args.paranoid)
Expand Down

0 comments on commit 20f2c51

Please sign in to comment.