From 4d8df76f401c7dde7dcb851e2536c7c00eb155eb Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Sat, 25 Apr 2020 19:28:03 +0200 Subject: dnf: upgrade 4.2.2 -> 4.2.21 Drop upstreamed patches. (From OE-Core rev: 7828bf903001413cb38d34f4a2525f718380b88f) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../dnf/dnf/Fix-SyntaxWarning.patch | 34 ---------------------- 1 file changed, 34 deletions(-) delete mode 100644 meta/recipes-devtools/dnf/dnf/Fix-SyntaxWarning.patch (limited to 'meta/recipes-devtools/dnf/dnf') diff --git a/meta/recipes-devtools/dnf/dnf/Fix-SyntaxWarning.patch b/meta/recipes-devtools/dnf/dnf/Fix-SyntaxWarning.patch deleted file mode 100644 index 1bd8b09594..0000000000 --- a/meta/recipes-devtools/dnf/dnf/Fix-SyntaxWarning.patch +++ /dev/null @@ -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 - - -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 - -- cgit v1.2.3-54-g00ecf