Allowed dists to be overwritten by default

inclement · inclement · commit b50fc1816928 · 2018-11-18T17:55:13.000Z
diff --git a/pythonforandroid/toolchain.py b/pythonforandroid/toolchain.py
@@ -142,6 +142,8 @@ def wrapper_func(self, args):
                                       user_ndk_api=self.ndk_api)
         dist = self._dist
         if dist.needs_build:
+            if dist.folder_exists():  # possible if the dist is being replaced
+                dist.delete()
             info_notify('No dist exists that meets your requirements, '
                         'so one will be built.')
             build_dist_from_args(ctx, dist, args)
@@ -158,7 +160,8 @@ def dist_from_args(ctx, args):
         name=args.dist_name,
         ndk_api=args.ndk_api,
         recipes=split_argument_list(args.requirements),
-        require_perfect_match=args.require_perfect_match)
+        require_perfect_match=args.require_perfect_match,
+        allow_replace_dist=args.allow_replace_dist)
 
 
 def build_dist_from_args(ctx, dist, args):
@@ -316,6 +319,12 @@ def __init__(self):
             description=('Whether the dist recipes must perfectly match '
                          'those requested'))
 
+        add_boolean_option(
+            generic_parser, ["allow-replace-dist"],
+            default=True,
+            description='Whether existing dist names can be automatically replaced'
+            )
+
         generic_parser.add_argument(
             '--local-recipes', '--local_recipes',
             dest='local_recipes', default='./p4a-recipes',
@@ -921,10 +930,11 @@ def distributions(self, _args):
 
     def delete_dist(self, _args):
         dist = self._dist
-        if dist.needs_build:
+        if not dist.folder_exists():
             info('No dist exists that matches your specifications, '
                  'exiting without deleting.')
-        shutil.rmtree(dist.dist_dir)
+            return
+        dist.delete()
 
     def sdk_tools(self, args):
         """Runs the android binary from the detected SDK directory, passing
