summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Madison <matt@madison.systems>2016-07-20 05:16:36 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-26 08:56:28 +0100
commit2ab49268fd370d68401891870296fed56016fd90 (patch)
tree60395c4f86b361193e98978ba133b44eeadb01cc
parent0e63414bc39ca12049d49dd0c8b132fdb22f0d22 (diff)
downloadpoky-2ab49268fd370d68401891870296fed56016fd90.tar.gz
package_deb.bbclass: fix Python 3 error
Don't modify an OrderedDict while walking its keys. (From OE-Core rev: eb7f08c4c01313afc8350200eeb63daefde8a6f6) Signed-off-by: Matt Madison <matt@madison.systems> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/package_deb.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 8f9b09a780..6db69332e2 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -232,7 +232,7 @@ python do_package_deb () {
232 232
233 rdepends = bb.utils.explode_dep_versions2(localdata.getVar("RDEPENDS", True) or "") 233 rdepends = bb.utils.explode_dep_versions2(localdata.getVar("RDEPENDS", True) or "")
234 debian_cmp_remap(rdepends) 234 debian_cmp_remap(rdepends)
235 for dep in rdepends.keys(): 235 for dep in list(rdepends.keys()):
236 if dep == pkg: 236 if dep == pkg:
237 del rdepends[dep] 237 del rdepends[dep]
238 continue 238 continue
@@ -240,7 +240,7 @@ python do_package_deb () {
240 del rdepends[dep] 240 del rdepends[dep]
241 rrecommends = bb.utils.explode_dep_versions2(localdata.getVar("RRECOMMENDS", True) or "") 241 rrecommends = bb.utils.explode_dep_versions2(localdata.getVar("RRECOMMENDS", True) or "")
242 debian_cmp_remap(rrecommends) 242 debian_cmp_remap(rrecommends)
243 for dep in rrecommends.keys(): 243 for dep in list(rrecommends.keys()):
244 if '*' in dep: 244 if '*' in dep:
245 del rrecommends[dep] 245 del rrecommends[dep]
246 rsuggests = bb.utils.explode_dep_versions2(localdata.getVar("RSUGGESTS", True) or "") 246 rsuggests = bb.utils.explode_dep_versions2(localdata.getVar("RSUGGESTS", True) or "")