mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-05 18:50:09 +02:00
Adapt verify
This commit is contained in:
parent
0a770cf4bc
commit
19ea8fd894
@ -194,13 +194,18 @@ __complete_scanner() {
|
|||||||
|
|
||||||
__complete_verify() {
|
__complete_verify() {
|
||||||
opts="-h -v -p"
|
opts="-h -v -p"
|
||||||
lopts="--help --verbose --package"
|
lopts="--help --verbose"
|
||||||
case "${prev}" in
|
case "${cur}" in
|
||||||
-p|--package)
|
-*)
|
||||||
|
__complete_options
|
||||||
|
return 0;;
|
||||||
|
*:)
|
||||||
|
__vercode
|
||||||
|
return 0;;
|
||||||
|
*)
|
||||||
__package
|
__package
|
||||||
return 0;;
|
return 0;;
|
||||||
esac
|
esac
|
||||||
__complete_options
|
|
||||||
}
|
}
|
||||||
|
|
||||||
__complete_stats() {
|
__complete_stats() {
|
||||||
|
@ -57,7 +57,7 @@ def main():
|
|||||||
|
|
||||||
if args:
|
if args:
|
||||||
|
|
||||||
vercodes = common.read_pkg_args(args, options, True)
|
vercodes = common.read_pkg_args(args, True)
|
||||||
apks = { appid : None for appid in vercodes }
|
apks = { appid : None for appid in vercodes }
|
||||||
|
|
||||||
# Get the signed apk with the highest vercode
|
# Get the signed apk with the highest vercode
|
||||||
|
@ -57,60 +57,62 @@ def main():
|
|||||||
verified = 0
|
verified = 0
|
||||||
notverified = 0
|
notverified = 0
|
||||||
|
|
||||||
|
vercodes = common.read_pkg_args(args, True)
|
||||||
|
|
||||||
for apkfile in sorted(glob.glob(os.path.join(unsigned_dir, '*.apk'))):
|
for apkfile in sorted(glob.glob(os.path.join(unsigned_dir, '*.apk'))):
|
||||||
|
|
||||||
apkfilename = os.path.basename(apkfile)
|
apkfilename = os.path.basename(apkfile)
|
||||||
i = apkfilename.rfind('_')
|
appid, vercode = common.apknameinfo(apkfile)
|
||||||
if i == -1:
|
|
||||||
raise BuildException("Invalid apk name")
|
|
||||||
appid = apkfilename[:i]
|
|
||||||
|
|
||||||
if not options.package or options.package == appid:
|
if vercodes and appid not in vercodes:
|
||||||
|
continue
|
||||||
|
if vercodes[appid] and vercode not in vercodes[appid]:
|
||||||
|
continue
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
|
||||||
print "Processing " + apkfilename
|
print "Processing " + apkfilename
|
||||||
|
|
||||||
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)
|
||||||
url = 'https://f-droid.org/repo/' + apkfilename
|
url = 'https://f-droid.org/repo/' + apkfilename
|
||||||
print "...retrieving " + url
|
print "...retrieving " + url
|
||||||
p = subprocess.Popen(['wget', url],
|
p = subprocess.Popen(['wget', url],
|
||||||
cwd=tmp_dir,
|
cwd=tmp_dir,
|
||||||
stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
|
stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
|
||||||
out = p.communicate()[0]
|
out = p.communicate()[0]
|
||||||
if p.returncode != 0:
|
if p.returncode != 0:
|
||||||
raise Exception("Failed to get " + apkfilename)
|
raise Exception("Failed to get " + apkfilename)
|
||||||
|
|
||||||
thisdir = os.path.join(tmp_dir, 'this_apk')
|
thisdir = os.path.join(tmp_dir, 'this_apk')
|
||||||
thatdir = os.path.join(tmp_dir, 'that_apk')
|
thatdir = os.path.join(tmp_dir, 'that_apk')
|
||||||
for d in [thisdir, thatdir]:
|
for d in [thisdir, thatdir]:
|
||||||
if os.path.exists(d):
|
if os.path.exists(d):
|
||||||
shutil.rmtree(d)
|
shutil.rmtree(d)
|
||||||
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:
|
||||||
raise Exception("Failed to unpack local build of " + apkfilename)
|
raise Exception("Failed to unpack local build of " + apkfilename)
|
||||||
if subprocess.call(['jar', 'xf', os.path.join("..", "..", remoteapk)],
|
if subprocess.call(['jar', 'xf', os.path.join("..", "..", remoteapk)],
|
||||||
cwd=thatdir) != 0:
|
cwd=thatdir) != 0:
|
||||||
raise Exception("Failed to unpack remote build of " + apkfilename)
|
raise Exception("Failed to unpack remote build of " + apkfilename)
|
||||||
|
|
||||||
p = subprocess.Popen(['diff', '-r', 'this_apk', 'that_apk'],
|
p = subprocess.Popen(['diff', '-r', 'this_apk', 'that_apk'],
|
||||||
cwd=tmp_dir, stdout=subprocess.PIPE)
|
cwd=tmp_dir, stdout=subprocess.PIPE)
|
||||||
out = p.communicate()[0]
|
out = p.communicate()[0]
|
||||||
lines = out.splitlines()
|
lines = out.splitlines()
|
||||||
if len(lines) != 1 or lines[0].find('META-INF') == -1:
|
if len(lines) != 1 or lines[0].find('META-INF') == -1:
|
||||||
raise Exception("Unexpected diff output - " + out)
|
raise Exception("Unexpected diff output - " + out)
|
||||||
|
|
||||||
print "...successfully verified"
|
print "...successfully verified"
|
||||||
verified += 1
|
verified += 1
|
||||||
|
|
||||||
except Exception, e:
|
except Exception, e:
|
||||||
print "...NOT verified - {0}".format(e)
|
print "...NOT verified - {0}".format(e)
|
||||||
notverified += 1
|
notverified += 1
|
||||||
|
|
||||||
print "\nFinished"
|
print "\nFinished"
|
||||||
print "{0} successfully verified".format(verified)
|
print "{0} successfully verified".format(verified)
|
||||||
|
Loading…
Reference in New Issue
Block a user