This is an automated email from the git hooks/post-receive script.
praiskup pushed a commit to branch master
in repository copr/copr.
The following commit(s) were added to refs/heads/master by this push:
new 00f59d2 rpmbuild: fix custom method for F31's systemd
00f59d2 is described below
commit 00f59d2f6409ebdccda8298c69d658e667c4f10d
Author: Pavel Raiskup <praiskup(a)redhat.com>
AuthorDate: Fri Nov 29 18:03:03 2019 +0100
rpmbuild: fix custom method for F31's systemd
Use 'mock --copyin' rather than "mock --shell 'cat -'" for
copying files
into mock buildroot. This is bugfix caused by changed systemd-nspawn's
in F31, see
https://github.com/rpm-software-management/mock/issues/432.
Fixes: #1123
Merges: #1124
---
rpmbuild/bin/copr-sources-custom | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/rpmbuild/bin/copr-sources-custom b/rpmbuild/bin/copr-sources-custom
index 6729288..5eda4e1 100755
--- a/rpmbuild/bin/copr-sources-custom
+++ b/rpmbuild/bin/copr-sources-custom
@@ -80,7 +80,7 @@ if __name__ == "__main__":
pkgs = args.builddeps.split()
run_cmd(mock + ['--install'] + pkgs)
- run_cmd(mock + ['--shell', 'cat - > /script'], stdin=args.script)
+ run_cmd(mock + ['--copyin', args.script.name, '/script'])
setup_cmd = 'set -ex; chmod a+x /script;'
@@ -94,8 +94,8 @@ if __name__ == "__main__":
if args.hook_payload_file:
payload_file_inner = "{0}/hook_payload".format(pipes.quote(workdir))
- run_cmd(mock + ['--shell', 'cat - > ' + payload_file_inner],
- stdin=args.hook_payload_file)
+ run_cmd(mock + ['--copyin', args.hook_payload_file.name,
+ os.path.join(workdir, 'hook_payload')])
run_cmd(mock + ['--shell', 'chmod a+r ' + payload_file_inner])
cmd = 'set -xe ; cd {workdir} ; {env} /script'.format(
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.