p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix check_target_files_signatures 

common.UnzipTemp now returns a 2-tuple instead of just a string.

Bug: 3398407
Change-Id: Ifd0408283aaa15752caa549f4510a0a3db03c3fd
This commit is contained in:
Doug Zongker 2011-01-27 10:20:27 -08:00
parent 55d932840f
commit 6ae5381670
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()