mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-09-11 23:23:27 +02:00
Merge branch 'master' into 'master'
fix build issues Fixed three build issues: one PEP8 and two small errors in the tests. See merge request !39
This commit is contained in:
commit
7fdddb729e
@ -1537,8 +1537,7 @@ def scan_source(build_dir, root_dir, thisbuild):
|
||||
'application/zip',
|
||||
'application/java-archive',
|
||||
'application/octet-stream',
|
||||
'binary',
|
||||
):
|
||||
'binary', ):
|
||||
|
||||
if has_extension(fp, 'apk'):
|
||||
removeproblem('APK file', fd, fp)
|
||||
@ -1803,8 +1802,7 @@ def remove_signing_keys(build_dir):
|
||||
'project.properties',
|
||||
'build.properties',
|
||||
'default.properties',
|
||||
'ant.properties',
|
||||
]:
|
||||
'ant.properties', ]:
|
||||
if propfile in files:
|
||||
path = os.path.join(root, propfile)
|
||||
|
||||
|
@ -40,6 +40,7 @@ if __name__ == "__main__":
|
||||
parser.add_option("-v", "--verbose", action="store_true", default=False,
|
||||
help="Spew out even more information than normal")
|
||||
(fdroidserver.install.options, args) = parser.parse_args(['--verbose'])
|
||||
fdroidserver.common.options = fdroidserver.install.options
|
||||
|
||||
newSuite = unittest.TestSuite()
|
||||
newSuite.addTest(unittest.makeSuite(InstallTest))
|
||||
|
@ -18,7 +18,7 @@ if localmodule not in sys.path:
|
||||
|
||||
import fdroidserver.common
|
||||
import fdroidserver.update
|
||||
from fdroidserver.common import FDroidPopen, SilentPopen
|
||||
from fdroidserver.common import FDroidPopen
|
||||
|
||||
class UpdateTest(unittest.TestCase):
|
||||
'''fdroid update'''
|
||||
|
Loading…
Reference in New Issue
Block a user