kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-07-14 21:10:09 +02:00
Code Activity

A few more PEP8 fixes

Browse Source
This commit is contained in:
Daniel Martí 2014-05-07 16:13:22 +02:00
parent 7a699e4a48
commit 17a4f5c00f
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fdroidserver/server.py
View File

@ -67,7 +67,7 @@ def update_awsbucket(repo_section):
upload = False upload = False
file_to_upload = os.path.join(root, name) file_to_upload = os.path.join(root, name)
object_name = 'fdroid/' + os.path.relpath(file_to_upload, os.getcwd()) object_name = 'fdroid/' + os.path.relpath(file_to_upload, os.getcwd())
if not object_name in objs: if object_name not in objs:
upload = True upload = True
else: else:
obj = objs.pop(object_name) obj = objs.pop(object_name)

6
fdroidserver/update.py
View File

@ -251,7 +251,7 @@ def update_wiki(apps, apks):
page.delete('No longer published') page.delete('No longer published')
for pagename, text in genp.items(): for pagename, text in genp.items():
logging.debug("Checking " + pagename) logging.debug("Checking " + pagename)
if not pagename in existingpages: if pagename not in existingpages:
logging.debug("Creating page " + pagename) logging.debug("Creating page " + pagename)
try: try:
newpage = site.Pages[pagename] newpage = site.Pages[pagename]
@ -435,7 +435,7 @@ def scan_apks(apps, apkcache, repodir, knownapks):
perm = perm[16:] perm = perm[16:]
thisinfo['features'].append(perm) thisinfo['features'].append(perm)
if not 'sdkversion' in thisinfo: if 'sdkversion' not in thisinfo:
logging.warn("no SDK version information found") logging.warn("no SDK version information found")
thisinfo['sdkversion'] = 0 thisinfo['sdkversion'] = 0
@ -768,7 +768,7 @@ def make_index(apps, apks, repodir, archive, categories):
if 'srcname' in apk: if 'srcname' in apk:
addElement('srcname', apk['srcname'], doc, apkel) addElement('srcname', apk['srcname'], doc, apkel)
for hash_type in ['sha256']: for hash_type in ['sha256']:
if not hash_type in apk: if hash_type not in apk:
continue continue
hashel = doc.createElement("hash") hashel = doc.createElement("hash")
hashel.setAttribute("type", hash_type) hashel.setAttribute("type", hash_type)

3
makebuildserver
View File

@ -7,6 +7,7 @@ import time
import hashlib import hashlib
from optparse import OptionParser from optparse import OptionParser
def vagrant(params, cwd=None, printout=False): def vagrant(params, cwd=None, printout=False):
"""Run vagrant. """Run vagrant.
@ -106,6 +107,7 @@ else:
'606aadf815ae28cc7b0154996247c70d609f111b14e44bcbcd6cad4c87fefb6f')]) '606aadf815ae28cc7b0154996247c70d609f111b14e44bcbcd6cad4c87fefb6f')])
wanted = [] wanted = []
def sha256_for_file(path): def sha256_for_file(path):
with open(path, 'r') as f: with open(path, 'r') as f:
s = hashlib.sha256() s = hashlib.sha256()
@ -234,4 +236,3 @@ vagrant(['box', 'add', 'buildserver', boxfile, '-f'],
printout=options.verbose) printout=options.verbose)
os.remove(boxfile) os.remove(boxfile)