From: Daniel Martí <mvdan@mvdan.cc>
Date: Wed, 31 Jul 2013 17:35:57 +0000 (+0200)
Subject: Remove deprecated parameter
X-Git-Tag: 0.1~466
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=a49b405780356e4bdba5049b97ebaeb821f40c9e;p=fdroidserver.git

Remove deprecated parameter
---

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 72eba258..e51716b2 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -470,7 +470,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
         src = os.path.join(bindir, src)
 
     # 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")
 
     # By way of a sanity check, make sure the version and version
diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 8f3d5551..229fd42f 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1560,11 +1560,10 @@ class KnownApks:
         lst.reverse()
         return lst
 
-def isApkDebuggable(apkfile, sdk_path):
+def isApkDebuggable(apkfile):
     """Returns True if the given apk file is debuggable
 
-    :param apkfile: full path to the apk to check
-    :param sdk_path: path to android sdk (deprecated)"""
+    :param apkfile: full path to the apk to check"""
 
     if ('aapt_path' not in globals()):
         # (re-)read configuration
diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 435faed5..c705cb4b 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -318,7 +318,7 @@ def scan_apks(apps, apkcache, repodir, knownapks):
                 thisinfo['sdkversion'] = 0
 
             # Check for debuggable apks...
-            if common.isApkDebuggable(apkfile, sdk_path):
+            if common.isApkDebuggable(apkfile):
                 print "WARNING: {0} is debuggable... {1}".format(apkfile, line)
 
             # Calculate the md5 and sha256...