Mercurial > hg > truffle

changeset 18620:23de014b38ab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mx: fix missing frozenset constructor to fix intersection
author Andreas Woess <andreas.woess@jku.at>
date Thu, 04 Dec 2014 19:50:39 +0100
parents 965f1e08c083
children b3b241bbbbdb
files mxtool/mx.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mxtool/mx.py	Thu Dec 04 16:12:03 2014 +0100
+++ b/mxtool/mx.py	Thu Dec 04 19:50:39 2014 +0100
@@ -880,7 +880,7 @@
                     if not existing:
                         suite[s] = additional
                     else:
-                        conflicting = additional.keys() & existing.keys()
+                        conflicting = frozenset(additional.keys()) & frozenset(existing.keys())
                         if conflicting:
                             abort(modulePath + ' redefines: ' + ', '.join(conflicting))
                         existing.update(additional)