dnf: upgrade 4.2.2 -> 4.2.21

Drop upstreamed patches.

(From OE-Core rev: 7828bf903001413cb38d34f4a2525f718380b88f)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2020-04-25 19:28:03 +02:00
committed by Richard Purdie
parent 7add0b8b4d
commit 4d8df76f40
2 changed files with 1 additions and 36 deletions

View File

@@ -1,34 +0,0 @@
From 23c5b15efe42e5e6ee695e54798bac248532d8d6 Mon Sep 17 00:00:00 2001
Date: Tue, 28 May 2019 13:14:51 +0200
Subject: [oe-core][PATCH 1/1] Fix SyntaxWarning: "is" with a literal. Did you
mean "=="?
---
dnf/cli/commands/repoquery.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
Unchanged. Appears in version 4.2.7.
Upstream-Status: Backport [git://github.com/rpm-software-management/dnf.git]
Signed-off-by: Joe Slater <joe.slater@windriver.com>
diff --git a/dnf/cli/commands/repoquery.py b/dnf/cli/commands/repoquery.py
index 941a470..63fc668 100644
--- a/dnf/cli/commands/repoquery.py
+++ b/dnf/cli/commands/repoquery.py
@@ -611,7 +611,7 @@ class RepoQueryCommand(commands.Command):
def tree_seed(self, query, aquery, opts, level=-1, usedpkgs=None):
for pkg in sorted(set(query.run()), key=lambda p: p.name):
- usedpkgs = set() if usedpkgs is None or level is -1 else usedpkgs
+ usedpkgs = set() if usedpkgs is None or level == -1 else usedpkgs
if pkg.name.startswith("rpmlib") or pkg.name.startswith("solvable"):
return
self.grow_tree(level, pkg, opts)
--
2.7.4

View File

@@ -13,11 +13,10 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git \
file://0005-Do-not-prepend-installroot-to-logdir.patch \
file://0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
file://0030-Run-python-scripts-using-env.patch \
file://Fix-SyntaxWarning.patch \
file://0001-set-python-path-for-completion_helper.patch \
"
SRCREV = "9947306a55271b8b7c9e2b6e3b7d582885b6045d"
SRCREV = "864c381baabf024c299dca75abfda96139b8f583"
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
S = "${WORKDIR}/git"