diff options
| author | Dan Prince <dprince@redhat.com> | 2013-03-06 20:31:19 -0500 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2013-03-06 20:31:19 -0500 |
| commit | 427769cb943448e1e56388ae864ced788a5a5701 (patch) | |
| tree | ae524d0876af7a78c5dae78a9b84cf11bf41c9a2 /tools | |
| parent | 232620aed742d9669040d93a85fca3c0a5a79a16 (diff) | |
| download | oslo-427769cb943448e1e56388ae864ced788a5a5701.tar.gz oslo-427769cb943448e1e56388ae864ced788a5a5701.tar.xz oslo-427769cb943448e1e56388ae864ced788a5a5701.zip | |
Update install_venv_common to use patch -N.
This patch makes it possible to call the post_process function
in install_venv_common (which currently only patches files)
multiple times.
The motivation here is that I would like to use this to patch
virtual env's created by tox. Tox doesn't provide a good hook
to call post_process (which patches files) only once so the
idea here is we'll just let it call post_process all the time...
and for distro's where patching is used to fix the venv the
patch -N option will make it skip patches on subsequent runs.
Change-Id: Ib0a36e49dd1884de131c569fe8bb66fe20285e97
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/install_venv_common.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/install_venv_common.py b/tools/install_venv_common.py index fd9076f..393214e 100644 --- a/tools/install_venv_common.py +++ b/tools/install_venv_common.py @@ -185,7 +185,7 @@ class Fedora(Distro): self.run_command(['sudo', 'yum', 'install', '-y', pkg], **kwargs) def apply_patch(self, originalfile, patchfile): - self.run_command(['patch', originalfile, patchfile]) + self.run_command(['patch', '-N', originalfile, patchfile]) def install_virtualenv(self): if self.check_cmd('virtualenv'): |