opendev/gerrit
Code Issues Proposed changes

Revert "Make license-map compatible to both python2 and python3"

Browse Source 
The replacement is not equivalent and messes up the license output.
The actual asciidoctor warnings are only followup errors.

This reverts commit 49fa3930ac.

Bug: Issue 8417
Change-Id: I820b1d704ebd1c63d3822c0757d722d5c4305ced
This commit is contained in:
David Ostrovsky 2018-02-28 20:58:12 +01:00
parent d14334fe2d
commit 01fbe50f3a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/bzl/license-map.py
View File

@ -6,8 +6,8 @@ from __future__ import print_function
import argparse
from collections import defaultdict
from shutil import copyfileobj
from sys import stdout, stderr
import os
import xml.etree.ElementTree as ET
@ -113,8 +113,8 @@ for n in sorted(graph.keys()):
print()
print("[[%s_license]]" % safename)
print("----")
with open(n[2:].replace(":", "/"), "rb") as input:
os.write(stdout.fileno(), input.read(-1))
with open(n[2:].replace(":", "/")) as fd:
copyfileobj(fd, stdout)
print()
print("----")
print()

2
tools/bzl/license.bzl
View File

@ -25,7 +25,7 @@ def license_map(name, targets = [], opts = [], **kwargs):
# post process the XML into our favorite format.
native.genrule(
name = "gen_license_txt_" + name,
cmd = "python $(location //tools/bzl:license-map.py) %s %s > $@" % (" ".join(opts), " ".join(xmls)),
cmd = "python2 $(location //tools/bzl:license-map.py) %s %s > $@" % (" ".join(opts), " ".join(xmls)),
outs = [ name + ".txt" ],
tools = tools,
**kwargs