diff --git a/CHANGELOG.md b/CHANGELOG.md index a6bf6f6fe..f317829ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/bugzoo/mgr/container.py b/bugzoo/mgr/container.py index f7b40739c..d08145893 100644 --- a/bugzoo/mgr/container.py +++ b/bugzoo/mgr/container.py @@ -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", diff --git a/bugzoo/version.py b/bugzoo/version.py index dc2d64205..9b229b823 100644 --- a/bugzoo/version.py +++ b/bugzoo/version.py @@ -1 +1 @@ -__version__ = '2.1.29' +__version__ = '2.1.30'