fix bug

This reverts commit 44b4d690db.

this breaks detection of scmsync projects. Jan can live with not synced
git for a few weeks

lib/git.py

@@ -251,7 +251,7 @@ class Git:
 
     def add_gitea_remote(self, package):
         repo_name = package.replace("+", "_")
-        org_name = "rpm"
+        org_name = "pool"
 
         if not os.getenv("GITEA_TOKEN"):
             logging.warning("Not adding a remote due to missing $GITEA_TOKEN")

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}

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,

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)

opensuse-monitor.py

@@ -36,10 +36,12 @@ def listen_events():
             and "package" in body
             and body["project"] == "openSUSE:Factory"
         ):
-            if "/" in body["package"]:
+            # Strip multibuild flavors
+            package = body["package"].partition(':')[0]
+            if "/" in package:
                 return
 
-            (MY_TASKS_DIR / body["package"]).touch()
+            (MY_TASKS_DIR / package).touch()
             print(" [x] %r:%r" % (method.routing_key, body["package"]))
 
     channel.basic_consume(queue_name, callback, auto_ack=True)