StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "fix check_target_files_signatures" into honeycomb

Browse Source
This commit is contained in:
Doug Zongker
2011-01-27 10:32:16 -08:00
committed by Android (Google) Code Review
parent bb219fc3dc 6ae5381670
commit b54972c90d
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/releasetools/check_target_files_signatures
View File

@@ -47,7 +47,6 @@ if sys.hexversion < 0x02040000:
import os import os
import re import re
import sha
import shutil import shutil
import subprocess import subprocess
import tempfile import tempfile
@@ -112,7 +111,7 @@ class CertDB(object):
self.certs[cert] = self.certs[cert] + "," + name self.certs[cert] = self.certs[cert] + "," + name
else: else:
if name is None: if name is None:
name = "unknown cert %s (%s)" % (sha.sha(cert).hexdigest()[:12], name = "unknown cert %s (%s)" % (common.sha1(cert).hexdigest()[:12],
GetCertSubject(cert)) GetCertSubject(cert))
self.certs[cert] = name self.certs[cert] = name
@@ -245,7 +244,7 @@ class TargetFiles(object):
self.max_fn_len = 20 self.max_fn_len = 20
def LoadZipFile(self, filename): def LoadZipFile(self, filename):
d = common.UnzipTemp(filename, '*.apk') d, z = common.UnzipTemp(filename, '*.apk')
try: try:
self.apks = {} self.apks = {}
self.apks_by_basename = {} self.apks_by_basename = {}
@@ -263,7 +262,6 @@ class TargetFiles(object):
finally: finally:
shutil.rmtree(d) shutil.rmtree(d)
z = zipfile.ZipFile(open(filename, "rb"))
self.certmap = common.ReadApkCerts(z) self.certmap = common.ReadApkCerts(z)
z.close() z.close()