Merge branch 'stable-3.0' into stable-3.1
* stable-3.0:
maven_jar: Remove unsign attribute
Change-Id: I1a6af70db3b20b9bc630924f4aa2802ef6fea62a
diff --git a/tools/download_file.py b/tools/download_file.py
index 8f790be..f62a43c 100755
--- a/tools/download_file.py
+++ b/tools/download_file.py
@@ -80,7 +80,6 @@
opts.add_option('-v', help='expected content SHA-1')
opts.add_option('-x', action='append', help='file to delete from ZIP')
opts.add_option('--exclude_java_sources', action='store_true')
-opts.add_option('--unsign', action='store_true')
args, _ = opts.parse_args()
root_dir = args.o
@@ -138,18 +137,6 @@
print('error opening %s: %s' % (cache_ent, err), file=stderr)
exit(1)
-if args.unsign:
- try:
- with ZipFile(cache_ent, 'r') as zf:
- for n in zf.namelist():
- if (n.endswith('.RSA')
- or n.endswith('.SF')
- or n.endswith('.LIST')):
- exclude.append(n)
- except (BadZipfile, LargeZipFile) as err:
- print('error opening %s: %s' % (cache_ent, err), file=stderr)
- exit(1)
-
safe_mkdirs(path.dirname(args.o))
if exclude:
try:
diff --git a/tools/maven_jar.bzl b/tools/maven_jar.bzl
index c4cae43..46aa4c1 100644
--- a/tools/maven_jar.bzl
+++ b/tools/maven_jar.bzl
@@ -140,8 +140,6 @@
args = [python, script, "-o", binjar_path, "-u", binurl]
if ctx.attr.sha1:
args.extend(["-v", ctx.attr.sha1])
- if ctx.attr.unsign:
- args.append("--unsign")
for x in ctx.attr.exclude:
args.extend(["-x", x])
@@ -168,7 +166,6 @@
"repository": attr.string(default = MAVEN_CENTRAL),
"sha1": attr.string(mandatory = False),
"src_sha1": attr.string(),
- "unsign": attr.bool(default = False),
"exports": attr.string_list(),
"deps": attr.string_list(),
"_download_script": attr.label(default = Label("//tools:download_file.py")),