packages/dnf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!184 dnf:fix AttributeError when io busy and press ctrl c

Browse Source 
From: @chen-haixing-hw 
Reviewed-by: @anonymous_z 
Signed-off-by: @anonymous_z
This commit is contained in:
openeuler-ci-bot 2023-03-13 13:15:21 +00:00 committed by Gitee
commit 5d7b85df00
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
backport-fix-AttributeError-when-IO-busy-and-press-ctrl-c.patch Normal file
View File

@ -0,0 +1,29 @@
From 759e7a5586f279efd41b65b2f84e0dd3bcf77fbd Mon Sep 17 00:00:00 2001
From: chenhaixing123 <chenhaixing@huawei.com>
Date: Wed, 22 Feb 2023 17:27:04 +0800
Subject: [PATCH] fix AttributeError when IO busy and press ctrl c
Conflict:The content of "index" and "@@" are adapted
Reference:https://github.com/rpm-software-management/dnf/pull/1899/commits/759e7a5586f279efd41b65b2f84e0dd3bcf77fbd
---
dnf/conf/config.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/dnf/conf/config.py b/dnf/conf/config.py
index 32516d1..e08ca72 100644
--- a/dnf/conf/config.py
+++ b/dnf/conf/config.py
@@ -251,8 +251,9 @@ class MainConf(BaseConfig):
self.tempfiles = []
def __del__(self):
- for file_name in self.tempfiles:
- os.unlink(file_name)
+ if hasattr(self, 'tempfiles'):
+ for file_name in self.tempfiles:
+ os.unlink(file_name)
@property
def get_reposdir(self):
--
2.27.0

8
dnf.spec
View File

@ -3,7 +3,7 @@
Name: dnf
Version: 4.14.0
Release: 12
Release: 13
Summary: A software package manager that manages packages on Linux distributions.
License: GPLv2+ and GPLv2 and GPL
URL: https://github.com/rpm-software-management/dnf
@ -30,6 +30,7 @@ Patch6002: backport-fix-plugins-unit-tests-unload-plugins-upon-their-
Patch6003: backport-pass-whole-url-in-relativeUrl-to-packageTarget-for-rpm-url-download.patch
Patch6004: backport-add-support-for-rollback-of-group-upgrade-rollback.patch
Patch6005: backport-ignore-processing-variable-files-with-unsupported-encoding.patch
Patch6006: backport-fix-AttributeError-when-IO-busy-and-press-ctrl-c.patch
BuildArch: noarch
BuildRequires: cmake gettext systemd bash-completion python3-sphinx
@ -254,6 +255,11 @@ popd
%{_mandir}/man8/%{name}-automatic.8*
%changelog
* Mon Mar 13 2023 chenhaixing <chenhaixing@huawei.com> 4.14.0-13
- CVE:NA
- SUG:NA
- DESC:dnf:fix AttributeError when io busy and press ctrl c
* Tue Mar 7 2023 chenhaixing <chenhaixing@huawei.com> 4.14.0-12
- CVE:NA
- SUG:NA