Skip to content

Commit

Permalink
Added --ignore-whitespace option to patch to avoid difficulties with …
Browse files Browse the repository at this point in the history
…line endings (#349)

* added --ignore-whitespace option

* updated changelog

* updated version number
  • Loading branch information
ChrisTimperley authored Oct 5, 2019
1 parent 0f71317 commit c2e6e04
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
## 2.1.30 (XXXX-XX-XX)

### Changes

* Updated patch method in ContainerManager to use --ignore-whitespace option
in an effort to ignore file ending issues when patching.


## 2.1.29 (2019-09-06)

### Features
Expand Down
2 changes: 1 addition & 1 deletion bugzoo/mgr/container.py
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ def patch(self, container: Container, p: Patch) -> bool:
self.copy_to(container, file_host.name, file_container)

# run patch command inside the source directory
cmd = 'sudo chown $(whoami) "{}" && patch -p0 < "{}"'
cmd = 'sudo chown $(whoami) "{}" && patch --ignore-whitespace -p0 < "{}"'
cmd = cmd.format(file_container, file_container)
outcome = self.command(container, cmd, context=bug.source_dir)
logger.debug("Patch application outcome [%s]: (retcode=%d)\n%s",
Expand Down
2 changes: 1 addition & 1 deletion bugzoo/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '2.1.29'
__version__ = '2.1.30'

0 comments on commit c2e6e04

Please sign in to comment.