Skip to content

Commit 6baf9f5

Browse files
committed
Improve wording of messages.
1 parent 95e4c5a commit 6baf9f5

File tree

1 file changed

+8
-16
lines changed

1 file changed

+8
-16
lines changed

pythonforandroid/build.py

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -231,12 +231,10 @@ def prepare_build_environment(self,
231231
android_api = None
232232
if user_android_api:
233233
android_api = user_android_api
234-
info('Getting Android API version from user argument:'
235-
' it is {}'.format(android_api))
234+
info('Getting Android API version from user argument: {}'.format(android_api))
236235
elif 'ANDROIDAPI' in environ:
237236
android_api = environ['ANDROIDAPI']
238-
info('Found Android API target in $ANDROIDAPI:'
239-
' it is {}'.format(android_api))
237+
info('Found Android API target in $ANDROIDAPI: {}'.format(android_api))
240238
else:
241239
info('Android API target was not set manually, using '
242240
'the default of {}'.format(DEFAULT_ANDROID_API))
@@ -284,18 +282,15 @@ def prepare_build_environment(self,
284282
if ndk_dir is None: # The old P4A-specific dir
285283
ndk_dir = environ.get('ANDROIDNDK', None)
286284
if ndk_dir is not None:
287-
info('Found NDK dir in $ANDROIDNDK:'
288-
' it is {}'.format(ndk_dir))
285+
info('Found NDK dir in $ANDROIDNDK: {}'.format(ndk_dir))
289286
if ndk_dir is None: # Apparently the most common convention
290287
ndk_dir = environ.get('NDK_HOME', None)
291288
if ndk_dir is not None:
292-
info('Found NDK dir in $NDK_HOME:'
293-
' it is {}'.format(ndk_dir))
289+
info('Found NDK dir in $NDK_HOME: {}'.format(ndk_dir))
294290
if ndk_dir is None: # Another convention (with maven?)
295291
ndk_dir = environ.get('ANDROID_NDK_HOME', None)
296292
if ndk_dir is not None:
297-
info('Found NDK dir in $ANDROID_NDK_HOME:'
298-
' it is {}'.format(ndk_dir))
293+
info('Found NDK dir in $ANDROID_NDK_HOME: {}'.format(ndk_dir))
299294
if ndk_dir is None: # Checks in the buildozer NDK dir, useful
300295
# # for debug tests of p4a
301296
possible_dirs = glob.glob(expanduser(join(
@@ -319,13 +314,11 @@ def prepare_build_environment(self,
319314
if user_ndk_ver:
320315
ndk_ver = user_ndk_ver
321316
if ndk_dir is not None:
322-
info('Got NDK version from from user argument:'
323-
' it is {}'.format(ndk_ver))
317+
info('Got NDK version from from user argument: {}'.format(ndk_ver))
324318
if ndk_ver is None:
325319
ndk_ver = environ.get('ANDROIDNDKVER', None)
326320
if ndk_dir is not None:
327-
info('Got NDK version from $ANDROIDNDKVER:'
328-
' it is {}'.format(ndk_ver))
321+
info('Got NDK version from $ANDROIDNDKVER: {}'.format(ndk_ver))
329322

330323
self.ndk = 'google'
331324

@@ -340,8 +333,7 @@ def prepare_build_environment(self,
340333
self.ndk = 'crystax'
341334
if ndk_ver is None:
342335
ndk_ver = reported_ndk_ver
343-
info(('Got Android NDK version from the NDK dir: '
344-
'it is {}').format(ndk_ver))
336+
info(('Got Android NDK version from the NDK dir: {}').format(ndk_ver))
345337
else:
346338
if ndk_ver != reported_ndk_ver:
347339
warning('NDK version was set as {}, but checking '

0 commit comments

Comments
 (0)