Merge ~ilasc/launchpad:add-name-to-conda-pkg into launchpad:master

[Ioana Lasc]

Add the name to Conda packages

[Jürgen Gmach (jugmac00)]

review: Approve

diff --git a/lib/lp/archivepublisher/artifactory.py b/lib/lp/archivepublisher/artifactory.py
index f56799e..2df8e2c 100644
--- a/lib/lp/archivepublisher/artifactory.py
+++ b/lib/lp/archivepublisher/artifactory.py
@@ -67,7 +67,11 @@ def _path_for(
     elif repository_format == ArchiveRepositoryFormat.CONDA:
         subdir = release.getUserDefinedField("subdir")
         if subdir is None:
-            raise ValueError("Cannot publish a Conda package with no subdir")
+            raise ValueError(
+                "Cannot publish the Conda package '%s' "
+                "with version '%s', missing the 'subdir' "
+                "Conda property)" % (source_name, source_version)
+            )
         path = rootpath / subdir
     elif repository_format == ArchiveRepositoryFormat.GO_PROXY:
         module_path = release.getUserDefinedField("module-path")
diff --git a/lib/lp/archivepublisher/tests/test_artifactory.py b/lib/lp/archivepublisher/tests/test_artifactory.py
index 8cea8dd..730e8a9 100644
--- a/lib/lp/archivepublisher/tests/test_artifactory.py
+++ b/lib/lp/archivepublisher/tests/test_artifactory.py
@@ -126,6 +126,17 @@ class TestArtifactoryPool(TestCase):
             pool.pathFor(None, "foo", "1.0", pub_file),
         )
 
+    def test_pathFor_conda_with_file_no_subir(self):
+        pool = self.makePool(ArchiveRepositoryFormat.CONDA)
+        pub_file = FakePackageReleaseFile(
+            b"foo",
+            "foo-1.0.tar.bz2",
+            user_defined_fields=[("bogus_filed", "instead_of_subdir")],
+        )
+        self.assertRaises(
+            ValueError, pool.pathFor, None, "foo", "1.0", pub_file
+        )
+
     def test_pathFor_go_proxy_with_file(self):
         pool = self.makePool(ArchiveRepositoryFormat.GO_PROXY)
         pub_file = FakePackageReleaseFile(