Mercurial > hg > graal-compiler
comparison mxtool/mx.py @ 21068:53b2d64f8ad1
Distribution overlap is allowed for META-INF*, not just META-INF/services*
author | Gilles Duboscq <gilles.m.duboscq@oracle.com> |
---|---|
date | Tue, 21 Apr 2015 14:59:02 +0200 |
parents | 5ea65fe64368 |
children | bdeaa5a7b83c |
comparison
equal
deleted
inserted
replaced
21066:82539241ff38 | 21068:53b2d64f8ad1 |
---|---|
2796 for dist in sorted_dists(): | 2796 for dist in sorted_dists(): |
2797 if dist not in updatedAnnotationProcessorDists: | 2797 if dist not in updatedAnnotationProcessorDists: |
2798 archive(['@' + dist.name]) | 2798 archive(['@' + dist.name]) |
2799 if args.check_distributions and not dist.isProcessorDistribution: | 2799 if args.check_distributions and not dist.isProcessorDistribution: |
2800 with zipfile.ZipFile(dist.path, 'r') as zf: | 2800 with zipfile.ZipFile(dist.path, 'r') as zf: |
2801 files.extend([member for member in zf.namelist() if not member.startswith('META-INF/services')]) | 2801 files.extend([member for member in zf.namelist() if not member.startswith('META-INF')]) |
2802 dups = set([x for x in files if files.count(x) > 1]) | 2802 dups = set([x for x in files if files.count(x) > 1]) |
2803 if len(dups) > 0: | 2803 if len(dups) > 0: |
2804 abort('Distributions overlap! duplicates: ' + str(dups)) | 2804 abort('Distributions overlap! duplicates: ' + str(dups)) |
2805 | 2805 |
2806 if suppliedParser: | 2806 if suppliedParser: |