[editables] Store full path to 'conanfile.py'

conans/client/cache/cache.py

@@ -77,7 +77,7 @@ def __init__(self, cache_folder, output):
         # paths
         self._store_folder = self.config.storage_path or self.cache_folder
         # Just call it to make it raise in case of short_paths misconfiguration
-        self.config.short_paths_home
+        _ = self.config.short_paths_home
 
     def all_refs(self):
         subdirs = list_folder_subdirs(basedir=self._store_folder, level=4)
@@ -100,7 +100,13 @@ def package_layout(self, ref, short_paths=None):
         if edited_ref:
             base_path = edited_ref["path"]
             layout_file = edited_ref["layout"]
-            return PackageEditableLayout(base_path, layout_file, ref)
+            if os.path.isfile(base_path):
+                conanfile_name = os.path.basename(base_path)
+                base_path = os.path.dirname(base_path)
+                return PackageEditableLayout(base_path, layout_file, ref, conanfile_name)
+            else:
+                # FIXME: Remove in Conan 2.0, introduced for <= 1.25 backward compatibility
+                return PackageEditableLayout(base_path, layout_file, ref)
         else:
             check_ref_case(ref, self.store)
             base_folder = os.path.normpath(os.path.join(self.store, ref.dir_repr()))
@@ -275,6 +281,7 @@ def reset_settings(self):
             remove(self.settings_path)
         self.initialize_settings()
 
+
 def _mix_settings_with_env(settings):
     """Reads CONAN_ENV_XXXX variables from environment
     and if it's defined uses these value instead of the default

conans/client/conan_api.py

@@ -1203,7 +1203,7 @@ def editable_add(self, path, reference, layout, cwd):
         layout_abs_path = get_editable_abs_path(layout, cwd, self.app.cache.cache_folder)
         if layout_abs_path:
             self.app.out.success("Using layout file: %s" % layout_abs_path)
-        self.app.cache.editable_packages.add(ref, os.path.dirname(target_path), layout_abs_path)
+        self.app.cache.editable_packages.add(ref, target_path, layout_abs_path)
 
     @api_method
     def editable_remove(self, reference):

conans/paths/package_layouts/package_editable_layout.py

@@ -11,11 +11,12 @@
 
 class PackageEditableLayout(object):
 
-    def __init__(self, base_folder, layout_file, ref):
+    def __init__(self, base_folder, layout_file, ref, conanfile=CONANFILE):
         assert isinstance(ref, ConanFileReference)
         self._ref = ref
         self._base_folder = base_folder
         self._layout_file = layout_file
+        self._conanfile_name = conanfile
 
     @property
     def ref(self):
@@ -29,7 +30,7 @@ def conanfile(self):
         """ Path to the conanfile. We can agree that an editable package
             needs to be a Conan package
         """
-        return os.path.join(self._base_folder, CONANFILE)
+        return os.path.join(self._base_folder, self._conanfile_name)
 
     def editable_cpp_info(self):
         if self._layout_file:

conans/test/functional/editable/editable_add_test.py

@@ -64,7 +64,16 @@ class Pck(ConanFile):
         self.assertIn("ERROR: Name and version from reference (wrong/version@user/channel) and "
                       "target conanfile.py (lib/version) must match", t.out)
 
-    def missing_subarguments_test(self):
+    def test_missing_subarguments(self):
         t = TestClient()
         t.run("editable", assert_error=True)
         self.assertIn("ERROR: Exiting with code: 2", t.out)
+
+    def test_conanfile_name(self):
+        ref = ConanFileReference.loads('lib/version@user/name')
+        t = TestClient()
+        t.save(files={'othername.py': self.conanfile})
+        t.run('editable add ./othername.py {}'.format(ref))
+        self.assertIn("Reference 'lib/version@user/name' in editable mode", t.out)
+        t.run('install {}'.format(ref))
+        self.assertIn("Installing package: {}".format(ref), t.out)