dnf:Fix bash completion due to sqlite changes and When parsing over a KVP list, do not return till the whole list is parsed
(cherry picked from commit bab4d99aebed759e6b58d1f45a07439ab7e71804)
This commit is contained in:
parent
7f4fe271d3
commit
c16ef50131
30
backport-Fix-bash-completion-due-to-sqlite-changes.patch
Normal file
30
backport-Fix-bash-completion-due-to-sqlite-changes.patch
Normal file
@ -0,0 +1,30 @@
|
||||
From 33fde245b0a49eb02837b6fedb2d14ed92c2d99f Mon Sep 17 00:00:00 2001
|
||||
From: grumpey <61189565+grumpey@users.noreply.github.com>
|
||||
Date: Sun, 20 Aug 2023 07:35:29 -0400
|
||||
Subject: [PATCH] Fix bash completion due to sqlite changes
|
||||
|
||||
Conflict:NA
|
||||
Reference:https://github.com/rpm-software-management/dnf/commit/33fde245b0a49eb02837b6fedb2d14ed92c2d99f
|
||||
|
||||
= changelog =
|
||||
msg: Fix bash completion due to sqlite changes
|
||||
type: bugfix
|
||||
resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2232052
|
||||
related: https://sqlite.org/src/info/c995932c3ffe7f27
|
||||
---
|
||||
etc/bash_completion.d/dnf | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/etc/bash_completion.d/dnf b/etc/bash_completion.d/dnf
|
||||
index eb34b807a9..8a9256a695 100644
|
||||
--- a/etc/bash_completion.d/dnf
|
||||
+++ b/etc/bash_completion.d/dnf
|
||||
@@ -112,7 +112,7 @@ _dnf_query_db()
|
||||
{
|
||||
local table=$1
|
||||
local prefix=$2
|
||||
- local query="select pkg from $table where pkg like \"$prefix%\""
|
||||
+ local query="select pkg from $table where pkg like '$prefix%'"
|
||||
if [ "$table" = "available" ]; then
|
||||
# The available table contains both installed and non-installed
|
||||
# packages. Exclude the installed packages.
|
||||
@ -0,0 +1,27 @@
|
||||
From 4d57212f4c3b7cca3844050a17518ca46bc1859a Mon Sep 17 00:00:00 2001
|
||||
From: Anish Bhatt <anish.bhatt@salesforce.com>
|
||||
Date: Mon, 10 Jul 2023 10:09:17 -0700
|
||||
Subject: [PATCH] When parsing over a KVP list, do not return till the whole
|
||||
list is parsed
|
||||
|
||||
Conflict:NA
|
||||
Reference:https://github.com/rpm-software-management/dnf/commit/4d57212f4c3b7cca3844050a17518ca46bc1859a
|
||||
---
|
||||
dnf/repodict.py | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dnf/repodict.py b/dnf/repodict.py
|
||||
index ffa0f8ed88..82c05ac002 100644
|
||||
--- a/dnf/repodict.py
|
||||
+++ b/dnf/repodict.py
|
||||
@@ -79,8 +79,8 @@ def substitute(values):
|
||||
if isinstance(value, str):
|
||||
substituted.append(
|
||||
libdnf.conf.ConfigParser.substitute(value, conf.substitutions))
|
||||
- if substituted:
|
||||
- return substituted
|
||||
+ if substituted:
|
||||
+ return substituted
|
||||
return values
|
||||
|
||||
repo = dnf.repo.Repo(repoid, conf)
|
||||
11
dnf.spec
11
dnf.spec
@ -3,7 +3,7 @@
|
||||
|
||||
Name: dnf
|
||||
Version: 4.14.0
|
||||
Release: 17
|
||||
Release: 18
|
||||
Summary: A software package manager that manages packages on Linux distributions.
|
||||
License: GPL-2.0-or-later AND GPL-1.0-only
|
||||
URL: https://github.com/rpm-software-management/dnf
|
||||
@ -25,6 +25,8 @@ Patch6005: backport-ignore-processing-variable-files-with-unsupported
|
||||
Patch6006: backport-fix-AttributeError-when-IO-busy-and-press-ctrl-c.patch
|
||||
Patch6007: backport-cli-allow-=in-setopt-values.patch
|
||||
Patch6008: backport-Add-provide-exception-handling.patch
|
||||
Patch6009: backport-When-parsing-over-a-KVP-list-do-not-return-till-the-whole.patch
|
||||
Patch6010: backport-Fix-bash-completion-due-to-sqlite-changes.patch
|
||||
|
||||
BuildArch: noarch
|
||||
BuildRequires: cmake gettext systemd bash-completion python3-sphinx
|
||||
@ -249,6 +251,13 @@ popd
|
||||
%{_mandir}/man8/%{name}-automatic.8*
|
||||
|
||||
%changelog
|
||||
* Fri Dec 29 2023 chenhaixing <chenhaixing@huawei.com> - 4.14.0-18
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
- SUG:NA
|
||||
- DESC:dnf:Fix bash completion due to sqlite changes
|
||||
When parsing over a KVP list, do not return till the whole list is parsed
|
||||
|
||||
* Mon Aug 14 2023 herengui <herengui@kylinsec.com.cn> - 4.14.0-17
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user