Mercurial > hg > truffle

comparison mxtool/mx.py @ 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 7d8270532cd9
children a8b46348b79f
comparison
equal deleted inserted replaced
18619:965f1e08c083 18620:23de014b38ab
878 additional = d.get(s) 878 additional = d.get(s)
879 if additional: 879 if additional:
880 if not existing: 880 if not existing:
881 suite[s] = additional 881 suite[s] = additional
882 else: 882 else:
883 conflicting = additional.keys() & existing.keys() 883 conflicting = frozenset(additional.keys()) & frozenset(existing.keys())
884 if conflicting: 884 if conflicting:
885 abort(modulePath + ' redefines: ' + ', '.join(conflicting)) 885 abort(modulePath + ' redefines: ' + ', '.join(conflicting))
886 existing.update(additional) 886 existing.update(additional)
887 distExtensions = d.get('distribution_extensions') 887 distExtensions = d.get('distribution_extensions')
888 if distExtensions: 888 if distExtensions: