diff options
| author |   Joe Slater <joe.slater@windriver.com> | 2020-03-04 16:30:20 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-03-06 08:19:12 +0000 |
| commit | 0870009f3e87d181178b3f26374862797f342d3f (patch) | |
| tree | b8ad60bed0dbfaf0cee355172e8e7c3c97cc46ea /meta/recipes-devtools/dnf | |
| parent | dc1e84d343a47d67b5aed28542031b173828cc71 (diff) | |
| download | openembedded-core-0870009f3e87d181178b3f26374862797f342d3f.tar.gz | |
dnf: fix python3 syntax warning
Backport from dnf version 4.2.7.
Signed-off-by: Joe Slater <joe.slater@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/dnf')
| -rw-r--r-- | meta/recipes-devtools/dnf/dnf/Fix-SyntaxWarning.patch | 34 | ||||
| -rw-r--r-- | meta/recipes-devtools/dnf/dnf_4.2.2.bb | 1 |
2 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-devtools/dnf/dnf/Fix-SyntaxWarning.patch b/meta/recipes-devtools/dnf/dnf/Fix-SyntaxWarning.patch new file mode 100644 index 0000000000..1bd8b09594 --- /dev/null +++ b/meta/recipes-devtools/dnf/dnf/Fix-SyntaxWarning.patch @@ -0,0 +1,34 @@ +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.2.bb index f6e616e7f1..5244e10cfc 100644 --- a/meta/recipes-devtools/dnf/dnf_4.2.2.bb +++ b/meta/recipes-devtools/dnf/dnf_4.2.2.bb @@ -13,6 +13,7 @@ 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 \ " SRCREV = "9947306a55271b8b7c9e2b6e3b7d582885b6045d" |