kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-04 14:30:11 +01:00
Code Activity

Fix too long lines in publish

Browse Source
This commit is contained in:
Ciaran Gultnieks 2014-05-12 23:01:53 +01:00
parent b18d1b422e
commit 751daf0cda
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fdroidserver/publish.py
View File

@ -39,7 +39,8 @@ def main():
global config, options global config, options
# Parse command line... # Parse command line...
parser = OptionParser(usage="Usage: %prog [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]") parser = OptionParser(usage="Usage: %prog [options] "
"[APPID[:VERCODE] [APPID[:VERCODE] ...]]")
parser.add_option("-v", "--verbose", action="store_true", default=False, parser.add_option("-v", "--verbose", action="store_true", default=False,
help="Spew out even more information than normal") help="Spew out even more information than normal")
parser.add_option("-q", "--quiet", action="store_true", default=False, parser.add_option("-q", "--quiet", action="store_true", default=False,
@ -68,12 +69,15 @@ def main():
logging.warning("No unsigned directory - nothing to do") logging.warning("No unsigned directory - nothing to do")
sys.exit(1) sys.exit(1)
for f in [config['keystorepassfile'], config['keystore'], config['keypassfile']]: for f in [config['keystorepassfile'],
config['keystore'],
config['keypassfile']]:
if not os.path.exists(f): if not os.path.exists(f):
logging.error("Config error - missing '{0}'".format(f)) logging.error("Config error - missing '{0}'".format(f))
sys.exit(1) sys.exit(1)
# It was suggested at https://dev.guardianproject.info/projects/bazaar/wiki/FDroid_Audit # It was suggested at
# https://dev.guardianproject.info/projects/bazaar/wiki/FDroid_Audit
# that a package could be crafted, such that it would use the same signing # that a package could be crafted, such that it would use the same signing
# key as an existing app. While it may be theoretically possible for such a # key as an existing app. While it may be theoretically possible for such a
# colliding package ID to be generated, it seems virtually impossible that # colliding package ID to be generated, it seems virtually impossible that
@ -92,7 +96,8 @@ def main():
logging.error("There is a keyalias collision - publishing halted") logging.error("There is a keyalias collision - publishing halted")
sys.exit(1) sys.exit(1)
allaliases.append(keyalias) allaliases.append(keyalias)
logging.info("{0} apps, {0} key aliases".format(len(allapps), len(allaliases))) logging.info("{0} apps, {0} key aliases".format(len(allapps),
len(allaliases)))
# Process any apks that are waiting to be signed... # Process any apks that are waiting to be signed...
for apkfile in sorted(glob.glob(os.path.join(unsigned_dir, '*.apk'))): for apkfile in sorted(glob.glob(os.path.join(unsigned_dir, '*.apk'))):