kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-04 14:30:11 +01:00
Code Activity

Merge branch 'master' into 'master'

Browse Source 
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:
Ciaran Gultnieks 2015-01-21 16:30:43 +00:00
commit 7fdddb729e
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fdroidserver/common.py
View File

@ -1537,8 +1537,7 @@ def scan_source(build_dir, root_dir, thisbuild):
'application/zip', 'application/zip',
'application/java-archive', 'application/java-archive',
'application/octet-stream', 'application/octet-stream',
'binary', 'binary', ):
):
if has_extension(fp, 'apk'): if has_extension(fp, 'apk'):
removeproblem('APK file', fd, fp) removeproblem('APK file', fd, fp)
@ -1803,8 +1802,7 @@ def remove_signing_keys(build_dir):
'project.properties', 'project.properties',
'build.properties', 'build.properties',
'default.properties', 'default.properties',
'ant.properties', 'ant.properties', ]:
]:
if propfile in files: if propfile in files:
path = os.path.join(root, propfile) path = os.path.join(root, propfile)

1
tests/install.TestCase
View File

@ -40,6 +40,7 @@ if __name__ == "__main__":
parser.add_option("-v", "--verbose", action="store_true", default=False, parser.add_option("-v", "--verbose", action="store_true", default=False,
help="Spew out even more information than normal") help="Spew out even more information than normal")
(fdroidserver.install.options, args) = parser.parse_args(['--verbose']) (fdroidserver.install.options, args) = parser.parse_args(['--verbose'])
fdroidserver.common.options = fdroidserver.install.options
newSuite = unittest.TestSuite() newSuite = unittest.TestSuite()
newSuite.addTest(unittest.makeSuite(InstallTest)) newSuite.addTest(unittest.makeSuite(InstallTest))

2
tests/update.TestCase
View File

@ -18,7 +18,7 @@ if localmodule not in sys.path:
import fdroidserver.common import fdroidserver.common
import fdroidserver.update import fdroidserver.update
from fdroidserver.common import FDroidPopen, SilentPopen from fdroidserver.common import FDroidPopen
class UpdateTest(unittest.TestCase): class UpdateTest(unittest.TestCase):
'''fdroid update''' '''fdroid update'''