summaryrefslogtreecommitdiffstats
path: root/scripts/combo-layer
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-05-18 21:39:44 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-02 08:10:03 +0100
commit25d4d8274bac696a484f83d7f3ada778cf95f4d0 (patch)
tree626c84b436b57344bbb512870f4d2acd9f5b1195 /scripts/combo-layer
parent210e290c9251839dc74e3aabdcea3655dd707a50 (diff)
downloadopenembedded-core-contrib-25d4d8274bac696a484f83d7f3ada778cf95f4d0.tar.gz
scripts: Fix deprecated dict methods for python3
Replaced iteritems -> items, itervalues -> values, iterkeys -> keys or 'in' Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Diffstat (limited to 'scripts/combo-layer')
-rwxr-xr-xscripts/combo-layer2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/combo-layer b/scripts/combo-layer
index e47059290d..52367f091d 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -1178,7 +1178,7 @@ def update_with_history(conf, components, revisions, repos):
# components imported head revision.
if additional_heads:
runcmd("git reset --hard", **wargs)
- for rev, base in additional_heads.iteritems():
+ for rev, base in additional_heads.items():
apply_commit(base, rev, wargs, wargs, None)
# Commit with all component branches as parents as well as the previous head.