Skip to content

Commit 3c77c21

Browse files
authored
Revert unintended commenting out of lines in cpio.py from #486 (#555)
- I assume I commented this out to test something on Windows, and left it in accidentally
1 parent 71348a6 commit 3c77c21

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

ofrak_core/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
3737
- Fix bugs on Windows arising from using `os.path` methods when only forward-slashes are acceptable ([#521](https://github.com/redballoonsecurity/ofrak/pull/521))
3838
- Made some changes to OFRAK test suite to improve test coverage on Windows ([#487](https://github.com/redballoonsecurity/ofrak/pull/487))
3939
- Fix usage of `NamedTemporaryFile` with external tools on Windows ([#486](https://github.com/redballoonsecurity/ofrak/pull/486))
40+
- Fix unintentional ignoring of cpio errors introduced in [#486](https://github.com/redballoonsecurity/ofrak/pull/486) ([#555](https://github.com/redballoonsecurity/ofrak/pull/555]))
4041

4142
### Changed
4243
- 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))

ofrak_core/ofrak/core/cpio.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ async def unpack(self, resource: Resource, config=None):
100100
cwd=temp_flush_dir,
101101
)
102102
await proc.communicate(input=resource_data)
103-
# if proc.returncode:
104-
# raise CalledProcessError(returncode=proc.returncode, cmd=cmd)
103+
if proc.returncode:
104+
raise CalledProcessError(returncode=proc.returncode, cmd=cmd)
105105
await cpio_v.initialize_from_disk(temp_flush_dir)
106106

107107

0 commit comments

Comments
 (0)