Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #13

Merged
merged 4 commits into from
Oct 21, 2019
Merged

Fixes #13

merged 4 commits into from
Oct 21, 2019

Conversation

gonmator
Copy link
Contributor

This pull request fixes two issues:

#11: aff4.LogicalImage.__init__() requires the container as first parameter. However, several functions in container.py (in LogicalImageContainer.images(), PreStdLogicalImageContainer.images() and PreStdLogicalImageContainer.open()) were missing that parameter (self), producing an exception when invoked as missing a positional argument.

#12: aff4.extract() and aff4.extractAll() functions were calling aff4.printVolumeInfo() passing the undefined variable file. Fixed passing the original file name of the container.

@gonmator
Copy link
Contributor Author

Additional fix included in this request:

In aff4.extract() function, the output file was opened as text file (open(destFile, "w")) as opposed as binary file (open(destFile, "wb")).

@blschatz blschatz merged commit 9fccc31 into aff4:master Oct 21, 2019
blschatz pushed a commit that referenced this pull request Oct 21, 2019
* Added /build/ directory to .gitignore

* Fixed bug initialising aff4.LogicalImage instances

* fixed bugs in extract()

* fixed aff4.extractAll() NameError exeption

* Fix call to extractAll function

This patch is partially necessary to correct the `--extract-all` flag.
With this correction, `--extract-all` will work if there were no
directories ingested from an input zip.

Issue 15 reports on the problem with directories from an ingested zip.
#15

This patch builds on Pull Request 13, as I'd also found the binary-
output mode was necessary, though in a different spot.
#13

Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
@gonmator gonmator deleted the fixes branch February 6, 2020 12:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants