Skip to content

Commit

Permalink
Minor corrections for build.py that should had been fixed in kivy#1541
Browse files Browse the repository at this point in the history
We merged by mistake the mentioned pr with some minor issues that should had been fixed in there. We solve that in here.

¡¡¡Thanks @AndreMiras!!!
  • Loading branch information
opacam committed Jan 13, 2019
1 parent ce0a651 commit 3b5da81
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions pythonforandroid/bootstraps/common/build/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -336,9 +336,11 @@ def make_package(args):
with open(args.intent_filters) as fd:
args.intent_filters = fd.read()

# if get_bootstrap_name() == "sdl2":
args.add_activity = args.add_activity or []
args.activity_launch_mode = args.activity_launch_mode or ''
if not args.add_activity:

This comment has been minimized.

Copy link
@AndreMiras

AndreMiras Jan 13, 2019

Or if you want to use the actual ternary operator:

args.add_activity = args.add_activity if args.add_activity else []
args.add_activity = []

if not args.activity_launch_mode:
args.activity_launch_mode = ''

if args.extra_source_dirs:
esd = []
Expand Down Expand Up @@ -687,7 +689,7 @@ def _read_configuration():
if args.meta_data is None:
args.meta_data = []

if (not hasattr(args, 'services')) or args.services is None:
if getattr(args, 'services', None) is None:
args.services = []

if args.try_system_python_compile:
Expand Down

0 comments on commit 3b5da81

Please sign in to comment.