summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/dnf
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/dnf')
-rw-r--r--meta/recipes-devtools/dnf/dnf/0001-dnf-write-the-log-lock-to-root.patch29
-rw-r--r--meta/recipes-devtools/dnf/dnf_4.2.21.bb1
2 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-devtools/dnf/dnf/0001-dnf-write-the-log-lock-to-root.patch b/meta/recipes-devtools/dnf/dnf/0001-dnf-write-the-log-lock-to-root.patch
new file mode 100644
index 0000000000..21b50dee01
--- /dev/null
+++ b/meta/recipes-devtools/dnf/dnf/0001-dnf-write-the-log-lock-to-root.patch
@@ -0,0 +1,29 @@
1From 5e07c16a506b19cbb107d5e99fca41d679b23b9a Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 28 Apr 2020 15:55:00 +0200
4Subject: [PATCH] dnf: write the log lock to root
5
6Writing it to /var/log appears to be racing with installation
7of base-files, and if lock is created first, base-files
8will refuse to install (due to the target directory
9already existing, and base-files creating it as a symlink).
10
11Upstream-Status: Inappropriate [oe-core specific]
12Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13---
14 dnf/logging.py | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/dnf/logging.py b/dnf/logging.py
18index bd660470..a9d808b1 100644
19--- a/dnf/logging.py
20+++ b/dnf/logging.py
21@@ -94,7 +94,7 @@ class MultiprocessRotatingFileHandler(logging.handlers.RotatingFileHandler):
22 def __init__(self, filename, mode='a', maxBytes=0, backupCount=0, encoding=None, delay=False):
23 super(MultiprocessRotatingFileHandler, self).__init__(
24 filename, mode, maxBytes, backupCount, encoding, delay)
25- self.rotate_lock = dnf.lock.build_log_lock("/var/log/", True)
26+ self.rotate_lock = dnf.lock.build_log_lock("/", True)
27
28 def emit(self, record):
29 while True:
diff --git a/meta/recipes-devtools/dnf/dnf_4.2.21.bb b/meta/recipes-devtools/dnf/dnf_4.2.21.bb
index 8f7757b72f..44dab1d8a6 100644
--- a/meta/recipes-devtools/dnf/dnf_4.2.21.bb
+++ b/meta/recipes-devtools/dnf/dnf_4.2.21.bb
@@ -14,6 +14,7 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git \
14 file://0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ 14 file://0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
15 file://0030-Run-python-scripts-using-env.patch \ 15 file://0030-Run-python-scripts-using-env.patch \
16 file://0001-set-python-path-for-completion_helper.patch \ 16 file://0001-set-python-path-for-completion_helper.patch \
17 file://0001-dnf-write-the-log-lock-to-root.patch \
17 " 18 "
18 19
19SRCREV = "864c381baabf024c299dca75abfda96139b8f583" 20SRCREV = "864c381baabf024c299dca75abfda96139b8f583"