!192 dnf:cli:allow = in setopt values
From: @chen-haixing-hw Reviewed-by: @anonymous_z Signed-off-by: @anonymous_z
This commit is contained in:
commit
a574a2343e
28
backport-cli-allow-=in-setopt-values.patch
Normal file
28
backport-cli-allow-=in-setopt-values.patch
Normal file
@ -0,0 +1,28 @@
|
||||
From e386cd384dffcbd91741357340f19967e79903cb Mon Sep 17 00:00:00 2001
|
||||
From: Anatoli Babenia <anatoli@rainforce.org>
|
||||
Date: Thu, 18 Aug 2022 09:35:51 +0300
|
||||
Subject: [PATCH] cli: Allow `=` in `setopt` values
|
||||
|
||||
Reference:https://github.com/rpm-software-management/dnf/commit/e386cd384dffcbd91741357340f19967e79903cb
|
||||
Conflict:NA
|
||||
---
|
||||
dnf/cli/option_parser.py | 5 +----
|
||||
1 file changed, 1 insertion(+), 4 deletions(-)
|
||||
|
||||
diff --git a/dnf/cli/option_parser.py b/dnf/cli/option_parser.py
|
||||
index 41ff16451d..042d5fbbee 100644
|
||||
--- a/dnf/cli/option_parser.py
|
||||
+++ b/dnf/cli/option_parser.py
|
||||
@@ -110,10 +110,7 @@ class _SetoptsCallback(argparse.Action):
|
||||
""" Parse setopts arguments and put them into main_<setopts>
|
||||
and repo_<setopts>."""
|
||||
def __call__(self, parser, namespace, values, opt_str):
|
||||
- vals = values.split('=')
|
||||
- if len(vals) > 2:
|
||||
- logger.warning(_("Setopt argument has multiple values: %s"), values)
|
||||
- return
|
||||
+ vals = values.split('=', maxsplit=1)
|
||||
if len(vals) < 2:
|
||||
logger.warning(_("Setopt argument has no value: %s"), values)
|
||||
return
|
||||
--
|
||||
9
dnf.spec
9
dnf.spec
@ -3,7 +3,7 @@
|
||||
|
||||
Name: dnf
|
||||
Version: 4.14.0
|
||||
Release: 13
|
||||
Release: 14
|
||||
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
|
||||
@ -31,6 +31,7 @@ Patch6003: backport-pass-whole-url-in-relativeUrl-to-packageTarget-fo
|
||||
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
|
||||
Patch6007: backport-cli-allow-=in-setopt-values.patch
|
||||
|
||||
BuildArch: noarch
|
||||
BuildRequires: cmake gettext systemd bash-completion python3-sphinx
|
||||
@ -255,6 +256,12 @@ popd
|
||||
%{_mandir}/man8/%{name}-automatic.8*
|
||||
|
||||
%changelog
|
||||
* Tue Jun 27 2023 chenhaixing <chenhaixing@huawei.com> - 4.14.0-14
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
- SUG:NA
|
||||
- DESC:dnf:cli:allow = in setopt values
|
||||
|
||||
* Mon Mar 13 2023 chenhaixing <chenhaixing@huawei.com> 4.14.0-13
|
||||
- CVE:NA
|
||||
- SUG:NA
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user