Mercurial > hg > truffle
changeset 21105:db2de6c2bf95
mx create each service file atomically
author | Gilles Duboscq <gilles.m.duboscq@oracle.com> |
---|---|
date | Thu, 23 Apr 2015 21:26:04 +0200 |
parents | 9690597d7a29 |
children | ec894427332d |
files | mx/mx_graal.py |
diffstat | 1 files changed, 15 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/mx/mx_graal.py Thu Apr 23 21:30:54 2015 +0200 +++ b/mx/mx_graal.py Thu Apr 23 21:26:04 2015 +0200 @@ -664,35 +664,35 @@ return filtered def _extractGraalServiceFiles(graalJars, destination, cleanDestination=True): - graalServices = set() if cleanDestination: if exists(destination): shutil.rmtree(destination) os.makedirs(destination) + servicesMap = {} for jar in graalJars: if os.path.isfile(jar): with zipfile.ZipFile(jar) as zf: - services = [] for member in zf.namelist(): if not member.startswith('META-INF/services'): continue serviceName = basename(member) # we don't handle directories assert serviceName and member == 'META-INF/services/' + serviceName - services.append(serviceName) - services = _filterGraalService(services, graalJars) - for serviceName in services: - graalServices.add(serviceName) - target = join(destination, serviceName) - lines = [] with zf.open(member) as serviceFile: - lines.extend(serviceFile.readlines()) - if exists(target): - with open(target) as targetFile: - lines.extend(targetFile.readlines()) - with open(target, "w+") as targetFile: - for line in lines: - targetFile.write(line.rstrip() + os.linesep) + serviceImpls = servicesMap.setdefault(serviceName, []) + serviceImpls.extend(serviceFile.readlines()) + 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) + target = join(destination, serviceName) + f.close() + shutil.move(tmp, target) + if mx.get_os() != 'windows': + os.chmod(target, JDK_UNIX_PERMISSIONS_FILE) return graalServices def _updateGraalServiceFiles(jdkDir):