diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2020-04-25 19:28:03 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-05-02 09:08:46 +0100 |
| commit | 7828bf903001413cb38d34f4a2525f718380b88f (patch) | |
| tree | cfcc1761287ef2db41091fcdd541cf364d196e5b | |
| parent | ce54462de6642935859421f2116e25ca5b2faa8c (diff) | |
| download | openembedded-core-contrib-7828bf903001413cb38d34f4a2525f718380b88f.tar.gz | |
dnf: upgrade 4.2.2 -> 4.2.21
Drop upstreamed patches.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/dnf/dnf/Fix-SyntaxWarning.patch | 34 | ||||
| -rw-r--r-- | meta/recipes-devtools/dnf/dnf_4.2.21.bb (renamed from meta/recipes-devtools/dnf/dnf_4.2.2.bb) | 3 |
2 files changed, 1 insertions, 36 deletions
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 <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 - diff --git a/meta/recipes-devtools/dnf/dnf_4.2.2.bb b/meta/recipes-devtools/dnf/dnf_4.2.21.bb index a046ffc05d..8f7757b72f 100644 --- a/meta/recipes-devtools/dnf/dnf_4.2.2.bb +++ b/meta/recipes-devtools/dnf/dnf_4.2.21.bb @@ -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" |