add support for changing upstream content #395
Conversation
This will auto commit changes to the upstream tarball as diffs for the debian increment. Addresses issue in #374
ros_buildfarm/sourcedeb_job.py
Outdated
| # set the option for dpkg-source to auto-commit upstream changes | ||
| # This is needed for Debian increments where the upstream has changed. | ||
| # It's not the best practice but we have people doing it a bunch. | ||
| '--hook-source=\'bash -c "echo auto-commit > debian/source/options"\'', |
There was a problem hiding this comment.
Since the file debian/source/options might already exist it would be better to append a line containing auto-commit rather than overwrite the content.
There was a problem hiding this comment.
I updated it to append instead of write. There's still some edge cases, like what happens if it's already defined. But I think those are fewer and a good config file parser should handle that.
ros_buildfarm/sourcedeb_job.py
Outdated
| # set the option for dpkg-source to auto-commit upstream changes | ||
| # This is needed for Debian increments where the upstream has changed. | ||
| # It's not the best practice but we have people doing it a bunch. | ||
| '--hook-source=\'bash -c "echo auto-commit >> debian/source/options"\'', |
There was a problem hiding this comment.
This only works when an existing file has a trailing newline. Please update it to also work when an existing file doesn't.
|
I retriggered http://build.ros.org/view/Kbin_djv8_dJv8/job/Ksrc_dJ__openhrp3__debian_jessie__source/18/ Once all downstream jobs have finished Kinetic can be synced again. Then we can merge pending rosdistro PRs. |
|
@tfoote This patch is failing new source jobs on Zesty and Stretch. Can you please take care of this, e.g.: |
This is a replacement for: ros-infrastructure/ros_buildfarm#395 which is more cross platform. e.g: ros-infrastructure/ros_buildfarm#397 and ros-infrastructure/ros_buildfarm#398
Reverts #395 #397 #398 in favor of ros-infrastructure/bloom#419
This will auto commit changes to the upstream tarball as diffs for the debian increment.
Addresses issue in #374
It's not recommended, but there are a lot of times that this comes up in our community. This will make the sourcedebs robust to that.
This fixed the build: http://build.ros.org/view/Kbin_uxhf_uXhf/job/Ksrc_uX__openhrp3__ubuntu_xenial__source/18/console