1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-09 00:40:11 +01:00

Uncomment verbose messages, fix -I

This commit is contained in:
Daniel Martí 2014-01-07 12:24:15 +01:00
parent 67172b778d
commit 8ea114114f

View File

@ -301,9 +301,9 @@ def resize_all_icons(repodirs):
for repodir in repodirs: for repodir in repodirs:
for density in get_densities(): for density in get_densities():
icon_dir = get_icon_dir(repodir, density) icon_dir = get_icon_dir(repodir, density)
icon_glob = os.path.join(repodir, icon_dir, '*.png') icon_glob = os.path.join(icon_dir, '*.png')
for iconpath in glob.glob(icon_glob): for iconpath in glob.glob(icon_glob):
resize_icon(iconpath) resize_icon(iconpath, density)
def scan_apks(apps, apkcache, repodir, knownapks): def scan_apks(apps, apkcache, repodir, knownapks):
"""Scan the apks in the given repo directory. """Scan the apks in the given repo directory.
@ -365,8 +365,6 @@ def scan_apks(apps, apkcache, repodir, knownapks):
'dump', 'badging', apkfile], 'dump', 'badging', apkfile],
stdout=subprocess.PIPE) stdout=subprocess.PIPE)
output = p.communicate()[0] output = p.communicate()[0]
#if options.verbose:
#print output
if p.returncode != 0: if p.returncode != 0:
print "ERROR: Failed to get apk information" print "ERROR: Failed to get apk information"
sys.exit(1) sys.exit(1)
@ -922,21 +920,21 @@ def main():
if added: if added:
app['added'] = added app['added'] = added
#else: else:
#if options.verbose: if options.verbose:
#print "WARNING: Don't know when " + app['id'] + " was added" print "WARNING: Don't know when " + app['id'] + " was added"
if lastupdated: if lastupdated:
app['lastupdated'] = lastupdated app['lastupdated'] = lastupdated
#else: else:
#if options.verbose: if options.verbose:
#print "WARNING: Don't know when " + app['id'] + " was last updated" print "WARNING: Don't know when " + app['id'] + " was last updated"
if bestver == 0: if bestver == 0:
if app['Name'] is None: if app['Name'] is None:
app['Name'] = app['id'] app['Name'] = app['id']
app['icon'] = None app['icon'] = None
#if options.verbose and app['Disabled'] is None: if options.verbose and app['Disabled'] is None:
#print "WARNING: Application " + app['id'] + " has no packages" print "WARNING: Application " + app['id'] + " has no packages"
else: else:
if app['Name'] is None: if app['Name'] is None:
app['Name'] = bestapk['name'] app['Name'] = bestapk['name']