fix pylint unused-argument
This commit is contained in:
parent
12c80f9062
commit
17cd07f1a7
|
@ -735,7 +735,7 @@ def build_local(app, build, vcs, build_dir, output_dir, log_dir, srclib_dir, ext
|
|||
src = os.path.normpath(apks[0])
|
||||
|
||||
# Make sure it's not debuggable...
|
||||
if common.isApkAndDebuggable(src, config):
|
||||
if common.isApkAndDebuggable(src):
|
||||
raise BuildException("APK is debuggable")
|
||||
|
||||
# By way of a sanity check, make sure the version and version
|
||||
|
|
|
@ -241,7 +241,7 @@ def check_repomanifest(app, branch=None):
|
|||
return (None, msg)
|
||||
|
||||
|
||||
def check_repotrunk(app, branch=None):
|
||||
def check_repotrunk(app):
|
||||
|
||||
try:
|
||||
if app.RepoType == 'srclib':
|
||||
|
@ -370,7 +370,7 @@ def fetch_autoname(app, tag):
|
|||
return commitmsg
|
||||
|
||||
|
||||
def checkupdates_app(app, first=True):
|
||||
def checkupdates_app(app):
|
||||
|
||||
# If a change is made, commitmsg should be set to a description of it.
|
||||
# Only if this is set will changes be written back to the metadata.
|
||||
|
|
|
@ -655,7 +655,7 @@ class vcs:
|
|||
|
||||
# Derived classes need to implement this. It's called once basic checking
|
||||
# has been performend.
|
||||
def gotorevisionx(self, rev):
|
||||
def gotorevisionx(self, rev): # pylint: disable=unused-argument
|
||||
raise VCSException("This VCS type doesn't define gotorevisionx")
|
||||
|
||||
# Initialise and update submodules
|
||||
|
@ -1683,7 +1683,7 @@ def get_apk_debuggable_androguard(apkfile):
|
|||
return False
|
||||
|
||||
|
||||
def isApkAndDebuggable(apkfile, config):
|
||||
def isApkAndDebuggable(apkfile):
|
||||
"""Returns True if the given file is an APK and is debuggable
|
||||
|
||||
:param apkfile: full path to the apk to check"""
|
||||
|
|
|
@ -39,9 +39,10 @@ def get_gradle_compile_commands(build):
|
|||
return [re.compile(r'\s*' + c, re.IGNORECASE) for c in compileCommands]
|
||||
|
||||
|
||||
# Scan the source code in the given directory (and all subdirectories)
|
||||
# and return the number of fatal problems encountered
|
||||
def scan_source(build_dir, root_dir, build):
|
||||
def scan_source(build_dir, build):
|
||||
"""Scan the source code in the given directory (and all subdirectories)
|
||||
and return the number of fatal problems encountered
|
||||
"""
|
||||
|
||||
count = 0
|
||||
|
||||
|
@ -111,7 +112,7 @@ def scan_source(build_dir, root_dir, build):
|
|||
return True
|
||||
return False
|
||||
|
||||
def ignoreproblem(what, fd, fp):
|
||||
def ignoreproblem(what, fd):
|
||||
logging.info('Ignoring %s at %s' % (what, fd))
|
||||
return 0
|
||||
|
||||
|
@ -127,7 +128,7 @@ def scan_source(build_dir, root_dir, build):
|
|||
|
||||
def handleproblem(what, fd, fp):
|
||||
if toignore(fd):
|
||||
return ignoreproblem(what, fd, fp)
|
||||
return ignoreproblem(what, fd)
|
||||
if todelete(fd):
|
||||
return removeproblem(what, fd, fp)
|
||||
logging.error('Found %s at %s' % (what, fd))
|
||||
|
@ -301,12 +302,12 @@ def main():
|
|||
logging.info("...scanning version " + build.versionName)
|
||||
|
||||
# Prepare the source code...
|
||||
root_dir, _ = common.prepare_source(vcs, app, build,
|
||||
build_dir, srclib_dir,
|
||||
extlib_dir, False)
|
||||
common.prepare_source(vcs, app, build,
|
||||
build_dir, srclib_dir,
|
||||
extlib_dir, False)
|
||||
|
||||
# Do the scan...
|
||||
count = scan_source(build_dir, root_dir, build)
|
||||
count = scan_source(build_dir, build)
|
||||
if count > 0:
|
||||
logging.warn('Scanner found %d problems in %s (%s)' % (
|
||||
count, appid, build.versionCode))
|
||||
|
|
|
@ -1137,7 +1137,7 @@ def scan_apk(apkcache, apkfilename, repodir, knownapks, use_date_from_apk):
|
|||
apk['minSdkVersion'] = 1
|
||||
|
||||
# Check for debuggable apks...
|
||||
if common.isApkAndDebuggable(apkfile, config):
|
||||
if common.isApkAndDebuggable(apkfile):
|
||||
logging.warning('{0} is set to android:debuggable="true"'.format(apkfile))
|
||||
|
||||
# Get the signature (or md5 of, to be precise)...
|
||||
|
|
|
@ -78,7 +78,7 @@ class CommonTest(unittest.TestCase):
|
|||
testfiles.append(os.path.join(os.path.dirname(__file__), 'urzip-badsig.apk'))
|
||||
testfiles.append(os.path.join(os.path.dirname(__file__), 'urzip-badcert.apk'))
|
||||
for apkfile in testfiles:
|
||||
debuggable = fdroidserver.common.isApkAndDebuggable(apkfile, config)
|
||||
debuggable = fdroidserver.common.isApkAndDebuggable(apkfile)
|
||||
self.assertTrue(debuggable,
|
||||
"debuggable APK state was not properly parsed!")
|
||||
# these are set NOT debuggable
|
||||
|
@ -86,7 +86,7 @@ class CommonTest(unittest.TestCase):
|
|||
testfiles.append(os.path.join(os.path.dirname(__file__), 'urzip-release.apk'))
|
||||
testfiles.append(os.path.join(os.path.dirname(__file__), 'urzip-release-unsigned.apk'))
|
||||
for apkfile in testfiles:
|
||||
debuggable = fdroidserver.common.isApkAndDebuggable(apkfile, config)
|
||||
debuggable = fdroidserver.common.isApkAndDebuggable(apkfile)
|
||||
self.assertFalse(debuggable,
|
||||
"debuggable APK state was not properly parsed!")
|
||||
|
||||
|
|
Loading…
Reference in New Issue