fix build_status and python package list

ziererf · ziererf · commit 97ae521dbd80 · 2017-04-11T20:54:15.000+02:00
- build status threw an exception if no bootstrap was
  available e.g. after clean_bootstrap_builds
- remove duplicates in list of python packages to install
diff --git a/pythonforandroid/build.py b/pythonforandroid/build.py
@@ -530,6 +530,7 @@ def build_recipes(build_order, python_modules, ctx):
     bs = ctx.bootstrap
     info_notify("Recipe build order is {}".format(build_order))
     if python_modules:
+        python_modules = sorted(set(python_modules))
         info_notify(
             ('The requirements ({}) were not found as recipes, they will be '
              'installed with pip.').format(', '.join(python_modules)))
diff --git a/pythonforandroid/toolchain.py b/pythonforandroid/toolchain.py
@@ -871,18 +871,20 @@ def _adb(self, commands):
 
 
     def build_status(self, args):
-
         print('{Style.BRIGHT}Bootstraps whose core components are probably '
               'already built:{Style.RESET_ALL}'.format(Style=Out_Style))
-        for filen in os.listdir(join(self.ctx.build_dir, 'bootstrap_builds')):
-            print('    {Fore.GREEN}{Style.BRIGHT}{filen}{Style.RESET_ALL}'
-                  .format(filen=filen, Fore=Out_Fore, Style=Out_Style))
+
+        bootstrap_dir = join(self.ctx.build_dir, 'bootstrap_builds')
+        if exists(bootstrap_dir):
+            for filen in os.listdir(bootstrap_dir):
+                print('    {Fore.GREEN}{Style.BRIGHT}{filen}{Style.RESET_ALL}'
+                      .format(filen=filen, Fore=Out_Fore, Style=Out_Style))
 
         print('{Style.BRIGHT}Recipes that are probably already built:'
               '{Style.RESET_ALL}'.format(Style=Out_Style))
-        if exists(join(self.ctx.build_dir, 'other_builds')):
-            for filen in sorted(
-                    os.listdir(join(self.ctx.build_dir, 'other_builds'))):
+        other_builds_dir = join(self.ctx.build_dir, 'other_builds')
+        if exists(other_builds_dir):
+            for filen in sorted(os.listdir(other_builds_dir)):
                 name = filen.split('-')[0]
                 dependencies = filen.split('-')[1:]
                 recipe_str = ('    {Style.BRIGHT}{Fore.GREEN}{name}'
