summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2010-07-07 16:07:45 +0100
committerSimon MacMullen <simon@rabbitmq.com>2010-07-07 16:07:45 +0100
commit5c2de7d811949872ba906895132b49f7a02a76ff (patch)
tree84094cfc958a77f6d41faae11d27b0656823135f
parent50ede83a05a26c0724b391180224f600f98a3a26 (diff)
downloadrabbitmq-codegen-bug22901.tar.gz
Make acc win in domains_merger.bug22901
-rw-r--r--amqp_codegen.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/amqp_codegen.py b/amqp_codegen.py
index 3d5e1e7..a10cc6d 100644
--- a/amqp_codegen.py
+++ b/amqp_codegen.py
@@ -76,8 +76,8 @@ def extension_info_merger(key, acc, new, ignore_conflicts):
return acc + [new]
def domains_merger(key, acc, new, ignore_conflicts):
- merged = dict((k, v) for [k, v] in new)
- for [k, v] in acc:
+ merged = dict((k, v) for [k, v] in acc)
+ for [k, v] in new:
if merged.has_key(k):
if not ignore_conflicts:
raise AmqpSpecFileMergeConflict(key, acc, new)