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,15 +57,17 @@ 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:
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user