|
 |
e45629d |
From aba277baf04346ea21d22adbeb97ab62d9a49c65 Mon Sep 17 00:00:00 2001
|
|
|
e45629d |
From: Martin Kutlak <mkutlak@redhat.com>
|
|
|
e45629d |
Date: Fri, 1 Nov 2019 15:04:59 +0100
|
|
|
e45629d |
Subject: [PATCH] retrace_worker: Remove distro hack from mock config
|
|
|
e45629d |
|
|
|
e45629d |
Introduced in 5a1e21a0f6ca8174a88f4eaf37887100e0ec311b
|
|
|
e45629d |
|
|
|
e45629d |
As `dnf` is now available on both RHEL(7,8) and Fedora (and with the `--skip-broken` switch support),
|
|
|
e45629d |
we can remove the `distro` "hack".
|
|
|
e45629d |
|
|
|
e45629d |
Signed-off-by: Martin Kutlak <mkutlak@redhat.com>
|
|
|
e45629d |
---
|
|
|
e45629d |
retrace-server.spec.in | 1 -
|
|
|
e45629d |
src/retrace/retrace_worker.py | 19 +++++--------------
|
|
|
e45629d |
2 files changed, 5 insertions(+), 15 deletions(-)
|
|
|
e45629d |
|
|
|
e45629d |
diff --git a/retrace-server.spec.in b/retrace-server.spec.in
|
|
|
e45629d |
index 5f5bbea..3b8d033 100644
|
|
|
e45629d |
--- a/retrace-server.spec.in
|
|
|
e45629d |
+++ b/retrace-server.spec.in
|
|
|
e45629d |
@@ -40,7 +40,6 @@ Requires: python3-webob
|
|
|
e45629d |
Requires: python3-magic
|
|
|
e45629d |
Requires: python3-requests
|
|
|
e45629d |
Requires: python3-requests-gssapi
|
|
|
e45629d |
-Requires: python3-distro
|
|
|
e45629d |
Requires: python3-bugzilla
|
|
|
e45629d |
Requires: python3-six
|
|
|
e45629d |
Requires: python3-dnf
|
|
|
e45629d |
diff --git a/src/retrace/retrace_worker.py b/src/retrace/retrace_worker.py
|
|
|
e45629d |
index 2ac8f6e..82748ac 100644
|
|
|
e45629d |
--- a/src/retrace/retrace_worker.py
|
|
|
e45629d |
+++ b/src/retrace/retrace_worker.py
|
|
|
e45629d |
@@ -9,7 +9,6 @@ import shutil
|
|
|
e45629d |
import stat
|
|
|
e45629d |
from subprocess import Popen, PIPE, STDOUT
|
|
|
e45629d |
|
|
|
e45629d |
-import distro
|
|
|
e45629d |
from .retrace import (ALLOWED_FILES, INPUT_PACKAGE_PARSER, REPO_PREFIX, REQUIRED_FILES,
|
|
|
e45629d |
STATUS, STATUS_ANALYZE, STATUS_BACKTRACE, STATUS_CLEANUP,
|
|
|
e45629d |
STATUS_FAIL, STATUS_INIT, STATUS_STATS, STATUS_SUCCESS,
|
|
|
e45629d |
@@ -473,20 +472,14 @@ class RetraceWorker(object):
|
|
|
e45629d |
# create mock config file
|
|
|
e45629d |
try:
|
|
|
e45629d |
repopath = os.path.join(CONFIG["RepoDir"], releaseid)
|
|
|
e45629d |
- linux_dist = distro.linux_distribution(full_distribution_name=False)
|
|
|
e45629d |
with open(os.path.join(task.get_savedir(), RetraceTask.MOCK_DEFAULT_CFG), "w") as mockcfg:
|
|
|
e45629d |
mockcfg.write("config_opts['root'] = '%d'\n" % task.get_taskid())
|
|
|
e45629d |
mockcfg.write("config_opts['target_arch'] = '%s'\n" % arch)
|
|
|
e45629d |
- mockcfg.write("config_opts['chroot_setup_cmd'] = '")
|
|
|
e45629d |
- if linux_dist[0] == "fedora":
|
|
|
e45629d |
- mockcfg.write("--setopt=strict=0")
|
|
|
e45629d |
- else:
|
|
|
e45629d |
- mockcfg.write("--skip-broken")
|
|
|
e45629d |
+ mockcfg.write("config_opts['chroot_setup_cmd'] = '--skip-broken")
|
|
|
e45629d |
mockcfg.write(" install %s abrt-addon-ccpp shadow-utils %s rpm'\n" % (" ".join(packages),
|
|
|
e45629d |
self.plugin.gdb_package))
|
|
|
e45629d |
- mockcfg.write("config_opts['releasever'] = '%s'\n" % linux_dist[1])
|
|
|
e45629d |
- if linux_dist[0] == "fedora":
|
|
|
e45629d |
- mockcfg.write("config_opts['package_manager'] = 'dnf'\n")
|
|
|
e45629d |
+ mockcfg.write("config_opts['releasever'] = '%s'\n" % version)
|
|
|
e45629d |
+ mockcfg.write("config_opts['package_manager'] = 'dnf'\n")
|
|
|
e45629d |
mockcfg.write("config_opts['plugin_conf']['ccache_enable'] = False\n")
|
|
|
e45629d |
mockcfg.write("config_opts['plugin_conf']['yum_cache_enable'] = False\n")
|
|
|
e45629d |
mockcfg.write("config_opts['plugin_conf']['root_cache_enable'] = False\n")
|
|
|
e45629d |
@@ -725,15 +718,13 @@ class RetraceWorker(object):
|
|
|
e45629d |
|
|
|
e45629d |
try:
|
|
|
e45629d |
cfgfile = os.path.join(cfgdir, RetraceTask.MOCK_DEFAULT_CFG)
|
|
|
e45629d |
- linux_dist = distro.linux_distribution(full_distribution_name=False)
|
|
|
e45629d |
with open(cfgfile, "w") as mockcfg:
|
|
|
e45629d |
mockcfg.write("config_opts['root'] = '%d-kernel'\n" % task.get_taskid())
|
|
|
e45629d |
mockcfg.write("config_opts['target_arch'] = '%s'\n" % kernelver.arch)
|
|
|
e45629d |
mockcfg.write("config_opts['chroot_setup_cmd'] = 'install bash coreutils cpio "
|
|
|
e45629d |
"crash findutils rpm shadow-utils'\n")
|
|
|
e45629d |
- mockcfg.write("config_opts['releasever'] = '%s'\n" % linux_dist[1])
|
|
|
e45629d |
- if linux_dist[0] == "fedora":
|
|
|
e45629d |
- mockcfg.write("config_opts['package_manager'] = 'dnf'\n")
|
|
|
e45629d |
+ mockcfg.write("config_opts['releasever'] = '%s'\n" % kernelver_str)
|
|
|
e45629d |
+ mockcfg.write("config_opts['package_manager'] = 'dnf'\n")
|
|
|
e45629d |
mockcfg.write("config_opts['plugin_conf']['ccache_enable'] = False\n")
|
|
|
e45629d |
mockcfg.write("config_opts['plugin_conf']['yum_cache_enable'] = False\n")
|
|
|
e45629d |
mockcfg.write("config_opts['plugin_conf']['root_cache_enable'] = False\n")
|
|
|
e45629d |
--
|
|
|
e45629d |
2.24.1
|
|
|
e45629d |
|