A few more verification fixes

This commit is contained in:
Ciaran Gultnieks 2013-08-29 14:22:21 +01:00
parent ee171ce6fd
commit 9c8161adf1

View file

@ -63,9 +63,13 @@ def main():
remoteapk = os.path.join(tmp_dir, apkfilename) remoteapk = os.path.join(tmp_dir, apkfilename)
if os.path.exists(remoteapk): if os.path.exists(remoteapk):
os.remove(remoteapk) os.remove(remoteapk)
if subprocess.call(['wget', url = 'https://f-droid.org/repo/' + apkfilename
'https://f-droid.org/repo/' + apkfilename], print "...retrieving " + url
cwd=tmp_dir) != 0: p = subprocess.Popen(['wget', url],
cwd=tmp_dir,
stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
out = p.communicate()[0]
if p.returncode != 0:
print "Failed to get " + apkfilename print "Failed to get " + apkfilename
sys.exit(1) sys.exit(1)
@ -77,11 +81,11 @@ def main():
os.mkdir(d) os.mkdir(d)
if subprocess.call(['jar', 'xf', if subprocess.call(['jar', 'xf',
os.path.join("..", unsigned_dir, apkfilename)], os.path.join("..", "..", unsigned_dir, apkfilename)],
cwd=thisdir) != 0: cwd=thisdir) != 0:
print "Failed to unpack local build of " + apkfilename print "Failed to unpack local build of " + apkfilename
sys.exit(1) sys.exit(1)
if subprocess.call(['jar', 'xf', os.path.join("..", remoteapk)], if subprocess.call(['jar', 'xf', os.path.join("..", "..", remoteapk)],
cwd=thisdir) != 0: cwd=thisdir) != 0:
print "Failed to unpack remote build of " + apkfilename print "Failed to unpack remote build of " + apkfilename
sys.exit(1) sys.exit(1)