mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-05 15:00:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add logging to verify

Browse source
This commit is contained in:
Daniel Martí 2014-01-27 16:48:08 +01:00
parent 2d2d21fc38
commit 040e575b10
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fdroidserver/build.py
View file

@ -665,7 +665,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
p = FDroidPopen([os.path.join(config['sdk_path'], p = FDroidPopen([os.path.join(config['sdk_path'],
'build-tools', config['build_tools'], 'aapt'), 'build-tools', config['build_tools'], 'aapt'),
'dump', 'badging', src]) 'dump', 'badging', src], ouptut=False)
vercode = None vercode = None
version = None version = None

18
fdroidserver/verify.py
View file

@ -23,10 +23,10 @@ import shutil
import subprocess import subprocess
import glob import glob
from optparse import OptionParser from optparse import OptionParser
import logging
from common import FDroidPopen
import common import common
from common import FDroidPopen
options = None options = None
config = None config = None
@ -45,12 +45,12 @@ def main():
tmp_dir = 'tmp' tmp_dir = 'tmp'
if not os.path.isdir(tmp_dir): if not os.path.isdir(tmp_dir):
print "Creating temporary directory" logging.info("Creating temporary directory")
os.makedirs(tmp_dir) os.makedirs(tmp_dir)
unsigned_dir = 'unsigned' unsigned_dir = 'unsigned'
if not os.path.isdir(unsigned_dir): if not os.path.isdir(unsigned_dir):
print "No unsigned directory - nothing to do" logging.error("No unsigned directory - nothing to do")
sys.exit(0) sys.exit(0)
verified = 0 verified = 0
@ -70,13 +70,13 @@ def main():
try: try:
print "Processing " + apkfilename logging.info("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 logging.info("...retrieving " + url)
p = FDroidPopen(['wget', url], cwd=tmp_dir) p = FDroidPopen(['wget', url], cwd=tmp_dir)
if p.returncode != 0: if p.returncode != 0:
raise Exception("Failed to get " + apkfilename) raise Exception("Failed to get " + apkfilename)
@ -101,14 +101,14 @@ def main():
if len(lines) != 1 or 'META-INF' not in lines[0]: if len(lines) != 1 or 'META-INF' not in lines[0]:
raise Exception("Unexpected diff output - " + p.stdout) raise Exception("Unexpected diff output - " + p.stdout)
print "...successfully verified" logging.info("...successfully verified")
verified += 1 verified += 1
except Exception, e: except Exception, e:
print "...NOT verified - {0}".format(e) logging.info("...NOT verified - {0}".format(e))
notverified += 1 notverified += 1
print "\nFinished" logging.info("Finished")
print "{0} successfully verified".format(verified) print "{0} successfully verified".format(verified)
print "{0} NOT verified".format(notverified) print "{0} NOT verified".format(notverified)