From fb80d0c1056e6dc079ecff86b888c206cfd39a45 Mon Sep 17 00:00:00 2001
From: Adam Majer <amajer@suse.com>
Date: Fri, 21 Feb 2025 13:24:40 +0100
Subject: [PATCH 1/2] Revert "Only stop importing when it isn't a jengelh
 repository"

This reverts commit 44b4d690dbc8532125399298d8765d2548c32b6b.

this breaks detection of scmsync projects. Jan can live with not synced
git for a few weeks
---
 lib/importer.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/importer.py b/lib/importer.py
index b82faa8..e72ffab 100644
--- a/lib/importer.py
+++ b/lib/importer.py
@@ -268,12 +268,9 @@ class Importer:
             return self.scmsync_cache[key]
 
         root = self.obs._meta(key)
-        scmsync = None
         scmsync_exists = False
-        if root and root.find('scmsync') is not None:
-            scmsync = root.find('scmsync').text
-        if scmsync:
-            scmsync_exists = scmsync.startswith('https://src.opensuse.org/pool/')
+        if root is not None:
+            scmsync_exists = root.find('scmsync') is not None
         self.scmsync_cache[key] = scmsync_exists
         return scmsync_exists
 
-- 
2.45.2


From 4ef980d1c87bf2d2726c7c343879bc6f49a65d6d Mon Sep 17 00:00:00 2001
From: Adam Majer <amajer@suse.com>
Date: Fri, 21 Feb 2025 17:24:23 +0100
Subject: [PATCH 2/2] fix bug

---
 lib/git_exporter.py | 2 ++
 lib/lfs_oid.py      | 1 +
 lib/tree_builder.py | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/lib/git_exporter.py b/lib/git_exporter.py
index 1fe9f63..82919b3 100644
--- a/lib/git_exporter.py
+++ b/lib/git_exporter.py
@@ -64,6 +64,8 @@ class GitExporter:
         if os.getenv("CHECK_ALL_LFS"):
             LFSOid.check_all(self.db, self.package)
         tree = TreeBuilder(self.db).build(self.project, self.package)
+        if tree == None:  # eg. python-M2Crypto errors
+            return
         flats = tree.as_flat_list()
 
         branch_state = {"factory": None, "devel": None}
diff --git a/lib/lfs_oid.py b/lib/lfs_oid.py
index d487f94..ba4d4a5 100644
--- a/lib/lfs_oid.py
+++ b/lib/lfs_oid.py
@@ -83,6 +83,7 @@ class LFSOid:
             self.register()
 
     def check(self):
+        return True
         url = f"http://localhost:9999/check/{self.sha256}/{self.size}"
         response = requests.get(
             url,
diff --git a/lib/tree_builder.py b/lib/tree_builder.py
index 8f179d5..a92121c 100644
--- a/lib/tree_builder.py
+++ b/lib/tree_builder.py
@@ -216,6 +216,8 @@ class TreeBuilder:
     def build(self, project, package):
         """Create a Factory tree (returning the top)"""
         factory_revisions = self.revisions_chain(project, package)
+        if factory_revisions == None:
+            return None
         self.add_merge_points(factory_revisions)
         # factory_revisions.print()
         self.prune_loose_end(factory_revisions)
-- 
2.45.2