mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-11-13 02:30:11 +01:00
Tidied up some unused junk
This commit is contained in:
parent
94598a05f5
commit
a762a0cb04
@ -504,7 +504,7 @@ def parse_metadata(metafile, verbose=False):
|
||||
thisbuild['version'] = parts[0]
|
||||
thisbuild['vercode'] = parts[1]
|
||||
try:
|
||||
testvercode = int(thisbuild['vercode'])
|
||||
int(thisbuild['vercode'])
|
||||
except:
|
||||
raise MetaDataException("Invalid version code for build in " + metafile.name)
|
||||
if parts[2].startswith('!'):
|
||||
@ -656,7 +656,7 @@ def parse_metadata(metafile, verbose=False):
|
||||
curbuild['version'] = vv[0]
|
||||
curbuild['vercode'] = vv[1]
|
||||
try:
|
||||
testvercode = int(curbuild['vercode'])
|
||||
int(curbuild['vercode'])
|
||||
except:
|
||||
raise MetaDataException("Invalid version code for build in " + metafile.name)
|
||||
buildlines = []
|
||||
@ -1063,7 +1063,6 @@ def fetch_real_name(app_dir, flavour):
|
||||
app_search = re.compile(r'.*<application.*').search
|
||||
name_search = re.compile(r'.*android:label="([^"]+)".*').search
|
||||
app_found = False
|
||||
name = None
|
||||
for f in manifest_paths(app_dir, flavour):
|
||||
if not f.endswith(".xml"):
|
||||
continue
|
||||
@ -1212,9 +1211,6 @@ def parse_srclib(metafile, **kw):
|
||||
if metafile is None:
|
||||
return thisinfo
|
||||
|
||||
mode = 0
|
||||
buildlines = []
|
||||
|
||||
for line in metafile:
|
||||
line = line.rstrip('\r\n')
|
||||
if len(line) == 0:
|
||||
@ -1573,8 +1569,6 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, sdk_path,
|
||||
|
||||
# Run a pre-build command if one is required...
|
||||
if 'prebuild' in build:
|
||||
output = ''
|
||||
error = ''
|
||||
cmd = build['prebuild']
|
||||
|
||||
# Substitute source library paths into prebuild commands...
|
||||
|
@ -21,7 +21,6 @@ import sys
|
||||
import os
|
||||
import traceback
|
||||
from optparse import OptionParser
|
||||
import HTMLParser
|
||||
import common
|
||||
from common import BuildException
|
||||
from common import VCSException
|
||||
@ -54,8 +53,6 @@ def main():
|
||||
print "No such package"
|
||||
sys.exit(1)
|
||||
|
||||
html_parser = HTMLParser.HTMLParser()
|
||||
|
||||
problems = []
|
||||
|
||||
build_dir = 'build'
|
||||
|
@ -60,7 +60,6 @@ def main():
|
||||
|
||||
statsdir = 'stats'
|
||||
logsdir = os.path.join(statsdir, 'logs')
|
||||
logsarchivedir = os.path.join(logsdir, 'archive')
|
||||
datadir = os.path.join(statsdir, 'data')
|
||||
if not os.path.exists(statsdir):
|
||||
os.mkdir(statsdir)
|
||||
@ -94,7 +93,7 @@ def main():
|
||||
os.path.getsize(destpath) != destsize):
|
||||
print "...retrieving " + f
|
||||
ftp.get(f, destpath)
|
||||
except Exception as e:
|
||||
except Exception:
|
||||
traceback.print_exc()
|
||||
sys.exit(1)
|
||||
finally:
|
||||
|
@ -588,7 +588,6 @@ def make_index(apps, apks, repodir, archive, categories):
|
||||
addElement('sdkver', str(apk['sdkversion']), doc, apkel)
|
||||
if 'added' in apk:
|
||||
addElement('added', time.strftime('%Y-%m-%d', apk['added']), doc, apkel)
|
||||
perms = ""
|
||||
if app['Requires Root']:
|
||||
if 'ACCESS_SUPERUSER' not in apk['permissions']:
|
||||
apk['permissions'].append('ACCESS_SUPERUSER')
|
||||
|
Loading…
Reference in New Issue
Block a user