mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-03 17:50:11 +02:00
Merge branch 'master' into 'master'
1.0 polish See merge request fdroid/fdroidserver!521
This commit is contained in:
commit
1cca767a6b
@ -1000,6 +1000,12 @@ def main():
|
||||
if options.reset_server and not options.server:
|
||||
parser.error("option %s: Using --reset-server without --server makes no sense" % "reset-server")
|
||||
|
||||
if options.onserver or not options.server:
|
||||
for d in ['build-tools', 'platform-tools', 'tools']:
|
||||
if not os.path.isdir(os.path.join(config['sdk_path'], d)):
|
||||
raise FDroidException(_("Android SDK '{path}' does not have '{dirname}' installed!")
|
||||
.format(path=config['sdk_path'], dirname=d))
|
||||
|
||||
log_dir = 'logs'
|
||||
if not os.path.isdir(log_dir):
|
||||
logging.info("Creating log directory")
|
||||
|
@ -51,8 +51,6 @@ from pyasn1.codec.der import decoder, encoder
|
||||
from pyasn1_modules import rfc2315
|
||||
from pyasn1.error import PyAsn1Error
|
||||
|
||||
from distutils.util import strtobool
|
||||
|
||||
import fdroidserver.metadata
|
||||
from fdroidserver import _
|
||||
from fdroidserver.exception import FDroidException, VCSException, NoSubmodulesException,\
|
||||
@ -439,11 +437,6 @@ def test_sdk_exists(thisconfig):
|
||||
logging.critical(_("Android SDK path '{path}' is not a directory!")
|
||||
.format(path=thisconfig['sdk_path']))
|
||||
return False
|
||||
for d in ['build-tools', 'platform-tools', 'tools']:
|
||||
if not os.path.isdir(os.path.join(thisconfig['sdk_path'], d)):
|
||||
logging.critical(_("Android SDK '{path}' does not have '{dirname}' installed!")
|
||||
.format(path=thisconfig['sdk_path'], dirname=d))
|
||||
return False
|
||||
return True
|
||||
|
||||
|
||||
@ -2031,8 +2024,8 @@ def is_apk_and_debuggable_androguard(apkfile):
|
||||
apkobject = _get_androguard_APK(apkfile)
|
||||
if apkobject.is_valid_APK():
|
||||
debuggable = apkobject.get_element("application", "debuggable")
|
||||
if debuggable is not None:
|
||||
return bool(strtobool(debuggable))
|
||||
if debuggable == 'true':
|
||||
return True
|
||||
return False
|
||||
|
||||
|
||||
|
@ -262,7 +262,7 @@ grep -F '<application id=' repo/index.xml > /dev/null
|
||||
grep -F '<install packageName=' repo/index.xml > /dev/null
|
||||
grep -F '<uninstall packageName=' repo/index.xml > /dev/null
|
||||
# OSX tests are run on Travis-CI, and gpg fails to launch gpg-agent there
|
||||
if [ "$TRAVIS_OS_NAME" != "osx" ]; then
|
||||
if [ "$TRAVIS_OS_NAME" != "osx" ] && which gpg; then
|
||||
$fdroid gpgsign --verbose
|
||||
$fdroid gpgsign --verbose
|
||||
test -e repo/obb.mainpatch.current_1619.apk.asc
|
||||
@ -621,7 +621,7 @@ mkdir -p $LOCAL_COPY_DIR/repo
|
||||
echo "local_copy_dir = '$LOCAL_COPY_DIR'" >> config.py
|
||||
|
||||
$fdroid checkupdates --allow-dirty
|
||||
$fdroid gpgsign
|
||||
which gpg && $fdroid gpgsign
|
||||
$fdroid lint
|
||||
$fdroid readmeta
|
||||
$fdroid rewritemeta fake
|
||||
|
Loading…
Reference in New Issue
Block a user