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:18 +0000 |
commit | ed32052e06b70e9273222b120e3272a978eda405 (patch) | |
tree | 6ea2303e0c1235ec9603b77e39ba99ac62aa79e2 /meta/recipes-devtools/dnf | |
parent | e06997e8bf3a8b38933c2917963e79fd00fb3418 (diff) | |
download | poky-ed32052e06b70e9273222b120e3272a978eda405.tar.gz |
dnf: fix python3 syntax warning
Backport from dnf version 4.2.7.
(From OE-Core rev: 0870009f3e87d181178b3f26374862797f342d3f)
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 @@ | |||
1 | From 23c5b15efe42e5e6ee695e54798bac248532d8d6 Mon Sep 17 00:00:00 2001 | ||
2 | |||
3 | Date: Tue, 28 May 2019 13:14:51 +0200 | ||
4 | Subject: [oe-core][PATCH 1/1] Fix SyntaxWarning: "is" with a literal. Did you | ||
5 | mean "=="? | ||
6 | |||
7 | --- | ||
8 | dnf/cli/commands/repoquery.py | 2 +- | ||
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
10 | --- | ||
11 | |||
12 | Unchanged. Appears in version 4.2.7. | ||
13 | |||
14 | Upstream-Status: Backport [git://github.com/rpm-software-management/dnf.git] | ||
15 | |||
16 | Signed-off-by: Joe Slater <joe.slater@windriver.com> | ||
17 | |||
18 | |||
19 | diff --git a/dnf/cli/commands/repoquery.py b/dnf/cli/commands/repoquery.py | ||
20 | index 941a470..63fc668 100644 | ||
21 | --- a/dnf/cli/commands/repoquery.py | ||
22 | +++ b/dnf/cli/commands/repoquery.py | ||
23 | @@ -611,7 +611,7 @@ class RepoQueryCommand(commands.Command): | ||
24 | |||
25 | def tree_seed(self, query, aquery, opts, level=-1, usedpkgs=None): | ||
26 | for pkg in sorted(set(query.run()), key=lambda p: p.name): | ||
27 | - usedpkgs = set() if usedpkgs is None or level is -1 else usedpkgs | ||
28 | + usedpkgs = set() if usedpkgs is None or level == -1 else usedpkgs | ||
29 | if pkg.name.startswith("rpmlib") or pkg.name.startswith("solvable"): | ||
30 | return | ||
31 | self.grow_tree(level, pkg, opts) | ||
32 | -- | ||
33 | 2.7.4 | ||
34 | |||
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 \ | |||
13 | file://0005-Do-not-prepend-installroot-to-logdir.patch \ | 13 | file://0005-Do-not-prepend-installroot-to-logdir.patch \ |
14 | file://0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ | 14 | file://0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ |
15 | file://0030-Run-python-scripts-using-env.patch \ | 15 | file://0030-Run-python-scripts-using-env.patch \ |
16 | file://Fix-SyntaxWarning.patch \ | ||
16 | " | 17 | " |
17 | 18 | ||
18 | SRCREV = "9947306a55271b8b7c9e2b6e3b7d582885b6045d" | 19 | SRCREV = "9947306a55271b8b7c9e2b6e3b7d582885b6045d" |