From 9bb7de738552b70eb69cc78fc3fdd44cd89a94b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 7 Feb 2020 19:52:27 +0100 Subject: [PATCH] Fedora CI: Update the mock config to support mock 2.0 See https://github.com/rpm-software-management/mock/wiki/Release-Notes-2.0 --- README.md | 2 +- tests/mocktest.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4b83779..1bf14aa 100644 --- a/README.md +++ b/README.md @@ -139,7 +139,7 @@ For example `#!/usr/bin/python3 -Ru` will be updated to `#!/usr/bin/python3 -sRu Sometimes, this can interfere with tests that run such scripts directly by name, because in tests we usually rely on `PYTHONPATH` (and `-s` ignores that). Would this behavior be undesired for any reason, -undefine `%{py3_shbang_opt}` to turn it of. +undefine `%{py3_shbang_opt}` to turn it off. Extras are currently ignored. diff --git a/tests/mocktest.sh b/tests/mocktest.sh index 57caf42..7a0c52d 100755 --- a/tests/mocktest.sh +++ b/tests/mocktest.sh @@ -17,7 +17,7 @@ if [ ! -f $config ]; then original="/etc/mock/fedora-${fedora}-x86_64.cfg" cp $original $config - echo -e '\n\nconfig_opts["yum.conf"] += """' >> $config + echo -e '\n\nconfig_opts[f"{config_opts.package_manager}.conf"] += """' >> $config cat /etc/yum.repos.d/test-pyproject-rpm-macros.repo >> $config echo -e '\n"""\n' >> $config fi