Merge pull request openSUSE#1849 from dirkmueller/pbuild_handling

Fix detection of gitstore

Author: dmach

osc/git_scm/store.py

@@ -117,7 +117,7 @@ def get_project_git_scm_store(self):
         subdirs_path = os.path.join(path, "_subdirs")
 
         # we always stop at the top-most directory that contains .git subdir
-        if not os.path.isfile(config_path) or os.path.isfile(pbuild_path):
+        if not (os.path.isfile(config_path) or os.path.isfile(pbuild_path)):
             # it's not a project, stop traversing and return
             return None
 

tests/test_git_scm_store.py

@@ -146,6 +146,32 @@ def test_pkg_git_project(self):
         self.assertEqual(store.project, "PROJ")
         self.assertEqual(store.package, "my-package")
 
+    def test_pkg_git_project_with_config_without_pbuild(self):
+        prj_path = os.path.join(self.tmpdir, "project")
+        self._git_init(prj_path)
+        self._write(os.path.join(prj_path, "_config"))
+        self._write(os.path.join(prj_path, "project.build"), "PROJ")
+
+        pkg_path = os.path.join(prj_path, "package")
+        self._git_init(pkg_path)
+
+        store = GitStore(pkg_path)
+        self.assertEqual(store.project, "PROJ")
+        self.assertEqual(store.package, "my-package")
+
+    def test_pkg_git_project_without_config_with_pbuild(self):
+        prj_path = os.path.join(self.tmpdir, "project")
+        self._git_init(prj_path)
+        self._write(os.path.join(prj_path, "_pbuild"))
+        self._write(os.path.join(prj_path, "project.build"), "PROJ")
+
+        pkg_path = os.path.join(prj_path, "package")
+        self._git_init(pkg_path)
+
+        store = GitStore(pkg_path)
+        self.assertEqual(store.project, "PROJ")
+        self.assertEqual(store.package, "my-package")
+
     def test_pkg_separate_git_dir_git_project(self):
         prj_path = os.path.join(self.tmpdir, "project")
         self._git_init(prj_path)