[dist] Add an arch suffix to our dists

So we avoid to overwrite them when arch changes (which is probably what we want)

Author: opacam

pythonforandroid/distribution.py

@@ -99,7 +99,9 @@ def get_distribution(cls, ctx, name=None, recipes=[],
 
         # 0) Check if a dist with that name already exists
         if name is not None and name:
-            possible_dists = [d for d in possible_dists if d.name == name]
+            possible_dists = [
+                d for d in possible_dists if d.name.startswith(name)
+            ]
             if possible_dists:
                 name_match_dist = possible_dists[0]
 
@@ -224,7 +226,10 @@ def get_distribution(cls, ctx, name=None, recipes=[],
                 i += 1
             name = filen.format(i)
 
-        dist.name = name
+        # we add a suffix to our dist name, so we avoid to
+        # overwrite them when building for different arch
+        suffix_arch = '-' + '-'.join([arch.nice_arch for arch in ctx.archs])
+        dist.name = name + suffix_arch
         dist.dist_dir = join(ctx.dist_dir, dist.name)
         dist.recipes = recipes_with_version
         dist.archs = req_archs

tests/test_bootstrap.py

@@ -84,7 +84,9 @@ def test_attributes(self):
 
         # test dist_dir success
         self.setUp_distribution_with_bootstrap(bs)
-        self.assertTrue(bs.dist_dir.endswith("dists/test_prj"))
+        self.assertTrue(bs.dist_dir.endswith(
+            "dists/test_prj-Armeabi-ArmeabiV7A-X86-X86_64-Arm64V8A")
+        )
 
     def test_build_dist_dirs(self):
         """A test which will initialize a bootstrap and will check if the

tests/test_distribution.py

@@ -73,7 +73,9 @@ def test_properties(self):
         distribution = self.ctx.bootstrap.distribution
         self.assertEqual(self.ctx, distribution.ctx)
         expected_repr = (
-            "<Distribution: name test_prj with recipes (python3, kivy)>"
+            "<Distribution: name "
+            "test_prj-Armeabi-ArmeabiV7A-X86-X86_64-Arm64V8A "
+            "with recipes (python3, kivy)>"
         )
         self.assertEqual(distribution.__str__(), expected_repr)
         self.assertEqual(distribution.__repr__(), expected_repr)
@@ -113,7 +115,9 @@ def test_get_distribution_no_name(self, mock_exists):
         mock_exists.return_value = False
         self.ctx.bootstrap = Bootstrap().get_bootstrap("sdl2", self.ctx)
         dist = Distribution.get_distribution(self.ctx)
-        self.assertEqual(dist.name, "unnamed_dist_1")
+        self.assertEqual(
+            dist.name, "unnamed_dist_1-Armeabi-ArmeabiV7A-X86-X86_64-Arm64V8A"
+        )
 
     @mock.patch("pythonforandroid.util.chdir")
     @mock.patch("pythonforandroid.distribution.open", create=True)