Skip to content

Commit

Permalink
Revert unintended commenting out of lines in cpio.py from #486 (#555)
Browse files Browse the repository at this point in the history
- I assume I commented this out to test something on Windows, and left it in accidentally
  • Loading branch information
alchzh authored Jan 3, 2025
1 parent 71348a6 commit 3c77c21
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions ofrak_core/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
- Fix bugs on Windows arising from using `os.path` methods when only forward-slashes are acceptable ([#521](https://github.com/redballoonsecurity/ofrak/pull/521))
- Made some changes to OFRAK test suite to improve test coverage on Windows ([#487](https://github.com/redballoonsecurity/ofrak/pull/487))
- Fix usage of `NamedTemporaryFile` with external tools on Windows ([#486](https://github.com/redballoonsecurity/ofrak/pull/486))
- Fix unintentional ignoring of cpio errors introduced in [#486](https://github.com/redballoonsecurity/ofrak/pull/486) ([#555](https://github.com/redballoonsecurity/ofrak/pull/555]))

### Changed
- By default, the ofrak log is now `ofrak-YYYYMMDDhhmmss.log` rather than just `ofrak.log` and the name can be specified on the command line ([#480](https://github.com/redballoonsecurity/ofrak/pull/480))
Expand Down
4 changes: 2 additions & 2 deletions ofrak_core/ofrak/core/cpio.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ async def unpack(self, resource: Resource, config=None):
cwd=temp_flush_dir,
)
await proc.communicate(input=resource_data)
# if proc.returncode:
# raise CalledProcessError(returncode=proc.returncode, cmd=cmd)
if proc.returncode:
raise CalledProcessError(returncode=proc.returncode, cmd=cmd)
await cpio_v.initialize_from_disk(temp_flush_dir)


Expand Down

0 comments on commit 3c77c21

Please sign in to comment.