Allowed dists to be overwritten by default

Author: inclement

pythonforandroid/build.py

@@ -124,19 +124,21 @@ def android_api(self):
 
     @android_api.setter
     def android_api(self, value):
+        print('android_api set to {}'.format(value))
         self._android_api = value
 
     @property
     def ndk_api(self):
         '''The API number compile against'''
         if self._ndk_api is None:
-            raise ValueError('Tried to access ndk_api_api but it has not '
+            raise ValueError('Tried to access ndk_api but it has not '
                              'been set - this should not happen, something '
                              'went wrong!')
         return self._ndk_api
 
     @ndk_api.setter
     def ndk_api(self, value):
+        print('ndk_api set to {}'.format(value))
         self._ndk_api = value
 
     @property

pythonforandroid/distribution.py

@@ -5,6 +5,8 @@
 from pythonforandroid.logger import (info, info_notify, warning,
                                      Err_Style, Err_Fore, error)
 from pythonforandroid.util import current_directory
+from os.path import exists
+from shutil import rmtree
 
 
 class Distribution(object):
@@ -46,7 +48,8 @@ def get_distribution(cls, ctx, name=None, recipes=[],
                          ndk_api=None,
                          force_build=False,
                          extra_dist_dirs=[],
-                         require_perfect_match=False):
+                         require_perfect_match=False,
+                         allow_replace_dist=True):
         '''Takes information about the distribution, and decides what kind of
         distribution it will be.
 
@@ -70,6 +73,10 @@ def get_distribution(cls, ctx, name=None, recipes=[],
         require_perfect_match : bool
             If True, will only match distributions with precisely the
             correct set of recipes.
+        allow_replace_dist : bool
+            If True, will allow an existing dist with the specified
+            name but incompatible requirements to be overwritten by
+            a new one with the current requirements.
         '''
 
         existing_dists = Distribution.get_distributions(ctx)
@@ -123,7 +130,7 @@ def get_distribution(cls, ctx, name=None, recipes=[],
         # If there was a name match but we didn't already choose it,
         # then the existing dist is incompatible with the requested
         # configuration and the build cannot continue
-        if name_match_dist is not None:
+        if name_match_dist is not None and not allow_replace_dist:
             error('Asked for dist with name {name} with recipes ({req_recipes}) and '
                   'NDK API {req_ndk_api}, but a dist '
                   'with this name already exists and has either incompatible recipes '
@@ -154,6 +161,12 @@ def get_distribution(cls, ctx, name=None, recipes=[],
 
         return dist
 
+    def folder_exists(self):
+        return exists(self.dist_dir)
+
+    def delete(self):
+        rmtree(self.dist_dir)
+
     @classmethod
     def get_distributions(cls, ctx, extra_dist_dirs=[]):
         '''Returns all the distributions found locally.'''