Merge pull request #1458 from dbrnz/improve_messages

Show actual values in info messages

Author: AndreMiras

pythonforandroid/build.py

@@ -231,10 +231,10 @@ def prepare_build_environment(self,
         android_api = None
         if user_android_api:
             android_api = user_android_api
-            info('Getting Android API version from user argument')
+            info('Getting Android API version from user argument: {}'.format(android_api))
         elif 'ANDROIDAPI' in environ:
             android_api = environ['ANDROIDAPI']
-            info('Found Android API target in $ANDROIDAPI')
+            info('Found Android API target in $ANDROIDAPI: {}'.format(android_api))
         else:
             info('Android API target was not set manually, using '
                  'the default of {}'.format(DEFAULT_ANDROID_API))
@@ -282,15 +282,15 @@ def prepare_build_environment(self,
         if ndk_dir is None:  # The old P4A-specific dir
             ndk_dir = environ.get('ANDROIDNDK', None)
             if ndk_dir is not None:
-                info('Found NDK dir in $ANDROIDNDK')
+                info('Found NDK dir in $ANDROIDNDK: {}'.format(ndk_dir))
         if ndk_dir is None:  # Apparently the most common convention
             ndk_dir = environ.get('NDK_HOME', None)
             if ndk_dir is not None:
-                info('Found NDK dir in $NDK_HOME')
+                info('Found NDK dir in $NDK_HOME: {}'.format(ndk_dir))
         if ndk_dir is None:  # Another convention (with maven?)
             ndk_dir = environ.get('ANDROID_NDK_HOME', None)
             if ndk_dir is not None:
-                info('Found NDK dir in $ANDROID_NDK_HOME')
+                info('Found NDK dir in $ANDROID_NDK_HOME: {}'.format(ndk_dir))
         if ndk_dir is None:  # Checks in the buildozer NDK dir, useful
             #                # for debug tests of p4a
             possible_dirs = glob.glob(expanduser(join(
@@ -314,11 +314,11 @@ def prepare_build_environment(self,
         if user_ndk_ver:
             ndk_ver = user_ndk_ver
             if ndk_dir is not None:
-                info('Got NDK version from from user argument')
+                info('Got NDK version from from user argument: {}'.format(ndk_ver))
         if ndk_ver is None:
             ndk_ver = environ.get('ANDROIDNDKVER', None)
             if ndk_dir is not None:
-                info('Got NDK version from $ANDROIDNDKVER')
+                info('Got NDK version from $ANDROIDNDKVER: {}'.format(ndk_ver))
 
         self.ndk = 'google'
 
@@ -333,8 +333,7 @@ def prepare_build_environment(self,
                 self.ndk = 'crystax'
             if ndk_ver is None:
                 ndk_ver = reported_ndk_ver
-                info(('Got Android NDK version from the NDK dir: '
-                      'it is {}').format(ndk_ver))
+                info(('Got Android NDK version from the NDK dir: {}').format(ndk_ver))
             else:
                 if ndk_ver != reported_ndk_ver:
                     warning('NDK version was set as {}, but checking '