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:24:01 +0100
commit7eab022d4b484aec40998f95835ba46c5da168cf (patch)
treee88a3bf01eada7d44e41bfadee5721ce6ec198e0 /scripts/combo-layer
parent63404baadbfd1225bbb955f8c8f817073aef65d8 (diff)
downloadpoky-7eab022d4b484aec40998f95835ba46c5da168cf.tar.gz
scripts: Fix deprecated dict methods for python3
Replaced iteritems -> items, itervalues -> values, iterkeys -> keys or 'in' (From OE-Core rev: 25d4d8274bac696a484f83d7f3ada778cf95f4d0) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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):
1178 # components imported head revision. 1178 # components imported head revision.
1179 if additional_heads: 1179 if additional_heads:
1180 runcmd("git reset --hard", **wargs) 1180 runcmd("git reset --hard", **wargs)
1181 for rev, base in additional_heads.iteritems(): 1181 for rev, base in additional_heads.items():
1182 apply_commit(base, rev, wargs, wargs, None) 1182 apply_commit(base, rev, wargs, wargs, None)
1183 1183
1184 # Commit with all component branches as parents as well as the previous head. 1184 # Commit with all component branches as parents as well as the previous head.