# HG changeset patch # User Gilles Duboscq # Date 1430143906 -7200 # Node ID 7f78f999512a5a125f6421e5bf704f8b8fc5a71d # Parent b625b459cf459e3d788b587b2dc316602d997ef5 mx: services: make sure we don't produce empty lines diff -r b625b459cf45 -r 7f78f999512a mx/mx_graal.py --- a/mx/mx_graal.py Mon Apr 27 17:24:27 2015 +0200 +++ b/mx/mx_graal.py Mon Apr 27 16:11:46 2015 +0200 @@ -682,14 +682,17 @@ assert serviceName and member == 'META-INF/services/' + serviceName with zf.open(member) as serviceFile: serviceImpls = servicesMap.setdefault(serviceName, []) - serviceImpls.extend(serviceFile.readlines()) + for line in serviceFile.readlines(): + line = line.strip() + if line: + serviceImpls.append(line) graalServices = _filterGraalService(servicesMap.keys(), graalJars) for serviceName in graalServices: serviceImpls = servicesMap[serviceName] fd, tmp = tempfile.mkstemp(prefix=serviceName) f = os.fdopen(fd, 'w+') for serviceImpl in serviceImpls: - f.write(serviceImpl.rstrip() + os.linesep) + f.write(serviceImpl + os.linesep) target = join(destination, serviceName) f.close() shutil.move(tmp, target)