Be more permissive when loading parent project_store in GitStore

Author: dmach

osc/git_scm/store.py

@@ -156,14 +156,23 @@ def __init__(self, path: str, *, check: bool = True):
         self.project_store = None
         if self.type == "package":
             # load either .osc or .git project store from the directory above topdir
-            for cls in (Store, self.__class__):
+            if not self.project_store:
                 try:
-                    store = cls(os.path.join(self.topdir, ".."))
+                    store = Store(os.path.join(self.topdir, ".."))
                     store.assert_is_project()
                     self.project_store = store
-                    break
                 except oscerr.NoWorkingCopy:
                     pass
+
+            if not self.project_store:
+                try:
+                    # turn off 'check' because we want at least partial metadata to be inherited to the package
+                    store = GitStore(os.path.join(self.topdir, ".."), check=False)
+                    if store.type == "project":
+                        self.project_store = store
+                except oscerr.NoWorkingCopy:
+                    pass
+
         elif self.type == "project":
             # load .osc project store that is next to .git and may provide medatata we don't have
             try:

tests/test_git_scm_store.py

@@ -103,6 +103,7 @@ def _git_init(self, path, *, separate_git_dir=None):
         if separate_git_dir:
             git_init_cmd += ["--separate-git-dir", separate_git_dir]
         subprocess.check_output(git_init_cmd, cwd=path)
+        subprocess.check_output(["git", "commit", "-m", "empty", "--allow-empty"], cwd=path)
         subprocess.check_output(["git", "checkout", "-b", "factory", "-q"], cwd=path)
         subprocess.check_output(["git", "remote", "add", "origin", "https://example.com/packages/my-package.git"], cwd=path)
 
@@ -326,6 +327,27 @@ def test_pkg_git_with_no_project(self):
         with self.assertRaises(oscerr.NoWorkingCopy):
             GitStore(pkg_path)
 
+    def test_pkg_git_in_submodule(self):
+        import subprocess
+
+        pkg_upstream_path = os.path.join(self.tmpdir, "pkg-upstream")
+        self._git_init(pkg_upstream_path)
+
+        prj_path = os.path.join(self.tmpdir, "project")
+        self._git_init(prj_path)
+        manifest_data = {
+            "obs_apiurl": "https://api.example.com",
+            "obs_project": "PROJ",
+        }
+        self._write(os.path.join(prj_path, "_manifest"), osc_yaml.yaml_dumps(manifest_data))
+
+        subprocess.check_output(["git", "-c", "protocol.file.allow=always", "submodule", "add", pkg_upstream_path, "pkg"], cwd=prj_path, stderr=subprocess.DEVNULL)
+        pkg_path = os.path.join(prj_path, "pkg")
+
+        store = GitStore(pkg_path)
+        self.assertEqual(store.project, "PROJ")
+        self.assertEqual(store.package, "pkg-upstream")
+
 
 if __name__ == "__main__":
     unittest.main()