Mercurial > hg > graal-compiler
changeset 21122:7f78f999512a
mx: services: make sure we don't produce empty lines
author | Gilles Duboscq <gilles.m.duboscq@oracle.com> |
---|---|
date | Mon, 27 Apr 2015 16:11:46 +0200 |
parents | b625b459cf45 |
children | 85b0935625c1 |
files | mx/mx_graal.py |
diffstat | 1 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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)