openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

am b54972c9: Merge "fix check_target_files_signatures" into honeycomb 

* commit 'b54972c90d0f8de8d74f93782c523aa211b1c8d7':
  fix check_target_files_signatures
This commit is contained in:
Doug Zongker 2011-01-27 10:34:36 -08:00 committed by Android Git Automerger
parent 6313b433ed b54972c90d
commit 79cad63f61
1 changed files with 2 additions and 4 deletions
Show Stats 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 re
import sha
import shutil
import subprocess
import tempfile
@ -112,7 +111,7 @@ class CertDB(object):
self.certs[cert] = self.certs[cert] + "," + name
else:
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))
self.certs[cert] = name
@ -245,7 +244,7 @@ class TargetFiles(object):
self.max_fn_len = 20
def LoadZipFile(self, filename):
d = common.UnzipTemp(filename, '*.apk')
d, z = common.UnzipTemp(filename, '*.apk')
try:
self.apks = {}
self.apks_by_basename = {}
@ -263,7 +262,6 @@ class TargetFiles(object):
finally:
shutil.rmtree(d)
z = zipfile.ZipFile(open(filename, "rb"))
self.certmap = common.ReadApkCerts(z)
z.close()