mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-14 06:52:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

make repo_keyalias like a config option: leave it commented out

Browse source 
Before, the code relies on repo_keyalias being None, which does not feel
conffile-like.  Now, its commented out if its not set.
This commit is contained in:
Hans-Christoph Steiner 2014-04-03 21:44:40 -04:00
parent f1ae3d3fd0
commit 0950cdac09
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
examples/config.py
View file

@ -54,9 +54,10 @@ of applications from the main repository.
""" """
#The key (from the keystore defined below) to be used for signing the # The key (from the keystore defined below) to be used for signing the
#repository itself. Can be None for an unsigned repository. # repository itself. This is the same name you would give to keytool or
repo_keyalias = None # jarsigner using -alias. (Not needed in an unsigned repository).
#repo_keyalias = "fdroidrepo"
#The keystore to use for release keys when building. This needs to be #The keystore to use for release keys when building. This needs to be
#somewhere safe and secure, and backed up! #somewhere safe and secure, and backed up!

4
fdroidserver/update.py
View file

@ -627,7 +627,7 @@ def make_index(apps, apks, repodir, archive, categories):
repoel.setAttribute("version", "12") repoel.setAttribute("version", "12")
repoel.setAttribute("timestamp", str(int(time.time()))) repoel.setAttribute("timestamp", str(int(time.time())))
if config['repo_keyalias']: if 'repo_keyalias' in config:
# Generate a certificate fingerprint the same way keytool does it # Generate a certificate fingerprint the same way keytool does it
# (but with slightly different formatting) # (but with slightly different formatting)
@ -783,7 +783,7 @@ def make_index(apps, apks, repodir, archive, categories):
of.write(output) of.write(output)
of.close() of.close()
if config['repo_keyalias'] is not None: if 'repo_keyalias' in config:
logging.info("Creating signed index.") logging.info("Creating signed index.")
logging.info("Key fingerprint: %s" % repo_pubkey_fingerprint) logging.info("Key fingerprint: %s" % repo_pubkey_fingerprint)