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

Remove deprecated parameter

Browse source
This commit is contained in:
Daniel Martí 2013-07-31 19:35:57 +02:00
parent e0e6e711c3
commit a49b405780
3 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fdroidserver/build.py
View file

@ -470,7 +470,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
src = os.path.join(bindir, src) src = os.path.join(bindir, src)
# Make sure it's not debuggable... # Make sure it's not debuggable...
if not install and common.isApkDebuggable(src, sdk_path): if not install and common.isApkDebuggable(src):
raise BuildException("APK is debuggable") raise BuildException("APK is debuggable")
# By way of a sanity check, make sure the version and version # By way of a sanity check, make sure the version and version

5
fdroidserver/common.py
View file

@ -1560,11 +1560,10 @@ class KnownApks:
lst.reverse() lst.reverse()
return lst return lst
def isApkDebuggable(apkfile, sdk_path): def isApkDebuggable(apkfile):
"""Returns True if the given apk file is debuggable """Returns True if the given apk file is debuggable
:param apkfile: full path to the apk to check :param apkfile: full path to the apk to check"""
:param sdk_path: path to android sdk (deprecated)"""
if ('aapt_path' not in globals()): if ('aapt_path' not in globals()):
# (re-)read configuration # (re-)read configuration

2
fdroidserver/update.py
View file

@ -318,7 +318,7 @@ def scan_apks(apps, apkcache, repodir, knownapks):
thisinfo['sdkversion'] = 0 thisinfo['sdkversion'] = 0
# Check for debuggable apks... # Check for debuggable apks...
if common.isApkDebuggable(apkfile, sdk_path): if common.isApkDebuggable(apkfile):
print "WARNING: {0} is debuggable... {1}".format(apkfile, line) print "WARNING: {0} is debuggable... {1}".format(apkfile, line)
# Calculate the md5 and sha256... # Calculate the md5 and sha256...