PR#1331: rpmbuild: don't delete the old .rpmnew files - copr/copr

copr / copr

#1331 rpmbuild: don't delete the old .rpmnew files

Merged 4 years ago by praiskup. Opened 4 years ago by praiskup.

Unknown source rpmbuild-clean into master

rpmbuild: don't delete the old .rpmnew files

Pavel Raiskup • 4 years ago

1e40b89

rpmbuild/copr-rpmbuild.spec

file modified

+1 -5

		`@@ -157,11 +157,7 @@`
		`#! /bin/sh`

		`# Update the Copr builder machine, can be called anytime Copr build system`
		`- # decides to do so (please keep the output idempotent).`
		`-`
		`- # Remove old rpmnew config files, if they exist now it is a configuration bug`
		`- # anyways.`
		`- find /etc/mock -name '*.rpmnew' -delete`
		`+ # decides to do so (please keep the script idempotent).`

		`# install the latest versions of those packages`
		`dnf update -y %latest_requires_packages`

praiskup commented 4 years ago

It is actually blocking our temporary overwrites of mock-core-configs
from koji builds [1] where we 1) run the script, 2) replace
mock-core-configs with custom version, and 3) run the script again.
When the '.rpmnew' files exist initially, the configs are (likely)
changed and we want them to be replaced.

There's potential that the .rpmnew files are too old (when they are
baked into builder image). Such situation needs to be worked-around by
explicit removal of those files in ansible.git.

[1] https://infrastructure.fedoraproject.org/cgit/ansible.git/commit/?id=57232452b086c171aa6e1ad1f441acffe7d376df