mirror of
https://git.yoctoproject.org/poky
synced 2026-04-21 12:32:15 +02:00
dnf: add a patch for base-files installation failures
(From OE-Core rev: 742a1b71249f4da1c8d8e13e270b0eb6128a3f66) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
4d8df76f40
commit
0bbb01c3b0
@@ -0,0 +1,29 @@
|
||||
From 5e07c16a506b19cbb107d5e99fca41d679b23b9a Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Tue, 28 Apr 2020 15:55:00 +0200
|
||||
Subject: [PATCH] dnf: write the log lock to root
|
||||
|
||||
Writing it to /var/log appears to be racing with installation
|
||||
of base-files, and if lock is created first, base-files
|
||||
will refuse to install (due to the target directory
|
||||
already existing, and base-files creating it as a symlink).
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
dnf/logging.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dnf/logging.py b/dnf/logging.py
|
||||
index bd660470..a9d808b1 100644
|
||||
--- a/dnf/logging.py
|
||||
+++ b/dnf/logging.py
|
||||
@@ -94,7 +94,7 @@ class MultiprocessRotatingFileHandler(logging.handlers.RotatingFileHandler):
|
||||
def __init__(self, filename, mode='a', maxBytes=0, backupCount=0, encoding=None, delay=False):
|
||||
super(MultiprocessRotatingFileHandler, self).__init__(
|
||||
filename, mode, maxBytes, backupCount, encoding, delay)
|
||||
- self.rotate_lock = dnf.lock.build_log_lock("/var/log/", True)
|
||||
+ self.rotate_lock = dnf.lock.build_log_lock("/", True)
|
||||
|
||||
def emit(self, record):
|
||||
while True:
|
||||
@@ -14,6 +14,7 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git \
|
||||
file://0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
|
||||
file://0030-Run-python-scripts-using-env.patch \
|
||||
file://0001-set-python-path-for-completion_helper.patch \
|
||||
file://0001-dnf-write-the-log-lock-to-root.patch \
|
||||
"
|
||||
|
||||
SRCREV = "864c381baabf024c299dca75abfda96139b8f583"
|
||||
|
||||
Reference in New Issue
Block a user