diff mxtool/mx.py @ 21071:0eff75735b29

Merge
author Gilles Duboscq <gilles.m.duboscq@oracle.com>
date Tue, 21 Apr 2015 17:32:53 +0200
parents 53b2d64f8ad1
children bdeaa5a7b83c
line wrap: on
line diff
--- a/mxtool/mx.py	Tue Apr 21 11:40:25 2015 +0200
+++ b/mxtool/mx.py	Tue Apr 21 17:32:53 2015 +0200
@@ -2798,7 +2798,7 @@
                 archive(['@' + dist.name])
             if args.check_distributions and not dist.isProcessorDistribution:
                 with zipfile.ZipFile(dist.path, 'r') as zf:
-                    files.extend([member for member in zf.namelist() if not member.startswith('META-INF/services')])
+                    files.extend([member for member in zf.namelist() if not member.startswith('META-INF')])
         dups = set([x for x in files if files.count(x) > 1])
         if len(dups) > 0:
             abort('Distributions overlap! duplicates: ' + str(dups))