From 16fb3ad162caa759d6f5b536701d65e686d75059 Mon Sep 17 00:00:00 2001 From: Tomas Kopecek Date: Aug 12 2019 22:02:36 +0000 Subject: enable dnf_warning in mock config Fixes: https://pagure.io/koji/issue/1594 --- diff --git a/koji/__init__.py b/koji/__init__.py index fb56bc8..b3ea04b 100644 --- a/koji/__init__.py +++ b/koji/__init__.py @@ -1486,7 +1486,9 @@ def genMockConfig(name, arch, managed=False, repoid=None, tag_name=None, **opts) 'rpmbuild_networking': opts.get('use_host_resolv', False), 'use_host_resolv': opts.get('use_host_resolv', False), # Don't let a build last more than 24 hours - 'rpmbuild_timeout': opts.get('rpmbuild_timeout', 86400) + 'rpmbuild_timeout': opts.get('rpmbuild_timeout', 86400), + # warn if yum is used instead of dnf + 'dnf_warning': True, } if opts.get('package_manager'): config_opts['package_manager'] = opts['package_manager'] diff --git a/tests/test_lib/data/mock/internaldev.out b/tests/test_lib/data/mock/internaldev.out index 1d8eaf8..6ef574e 100644 --- a/tests/test_lib/data/mock/internaldev.out +++ b/tests/test_lib/data/mock/internaldev.out @@ -3,6 +3,7 @@ config_opts['basedir'] = '/var/lib/mock' config_opts['chroot_setup_cmd'] = 'groupinstall build' config_opts['chroothome'] = '/builddir' +config_opts['dnf_warning'] = True config_opts['internal_dev_setup'] = False config_opts['root'] = 'ROOTNAME' config_opts['rpmbuild_networking'] = False diff --git a/tests/test_lib/data/mock/internaldev2.out b/tests/test_lib/data/mock/internaldev2.out index 4cea97f..c3e88d3 100644 --- a/tests/test_lib/data/mock/internaldev2.out +++ b/tests/test_lib/data/mock/internaldev2.out @@ -3,6 +3,7 @@ config_opts['basedir'] = '/var/lib/mock' config_opts['chroot_setup_cmd'] = 'groupinstall build' config_opts['chroothome'] = '/builddir' +config_opts['dnf_warning'] = True config_opts['internal_dev_setup'] = True config_opts['root'] = 'ROOTNAME' config_opts['rpmbuild_networking'] = False diff --git a/tests/test_lib/data/mock/simple.out b/tests/test_lib/data/mock/simple.out index 3aad8ff..39866cd 100644 --- a/tests/test_lib/data/mock/simple.out +++ b/tests/test_lib/data/mock/simple.out @@ -3,6 +3,7 @@ config_opts['basedir'] = '/var/lib/mock' config_opts['chroot_setup_cmd'] = 'groupinstall build' config_opts['chroothome'] = '/builddir' +config_opts['dnf_warning'] = True config_opts['root'] = 'ROOTNAME' config_opts['rpmbuild_networking'] = False config_opts['rpmbuild_timeout'] = 86400