Revert "Only stop importing when it isn't a jengelh repository" #33
@ -64,6 +64,8 @@ class GitExporter:
|
|||||||
if os.getenv("CHECK_ALL_LFS"):
|
if os.getenv("CHECK_ALL_LFS"):
|
||||||
LFSOid.check_all(self.db, self.package)
|
LFSOid.check_all(self.db, self.package)
|
||||||
tree = TreeBuilder(self.db).build(self.project, self.package)
|
tree = TreeBuilder(self.db).build(self.project, self.package)
|
||||||
|
if tree == None: # eg. python-M2Crypto errors
|
||||||
|
return
|
||||||
flats = tree.as_flat_list()
|
flats = tree.as_flat_list()
|
||||||
|
|
||||||
branch_state = {"factory": None, "devel": None}
|
branch_state = {"factory": None, "devel": None}
|
||||||
|
@ -268,12 +268,9 @@ class Importer:
|
|||||||
return self.scmsync_cache[key]
|
return self.scmsync_cache[key]
|
||||||
|
|
||||||
root = self.obs._meta(key)
|
root = self.obs._meta(key)
|
||||||
scmsync = None
|
|
||||||
scmsync_exists = False
|
scmsync_exists = False
|
||||||
if root and root.find('scmsync') is not None:
|
if root is not None:
|
||||||
scmsync = root.find('scmsync').text
|
scmsync_exists = root.find('scmsync') is not None
|
||||||
if scmsync:
|
|
||||||
scmsync_exists = scmsync.startswith('https://src.opensuse.org/pool/')
|
|
||||||
self.scmsync_cache[key] = scmsync_exists
|
self.scmsync_cache[key] = scmsync_exists
|
||||||
return scmsync_exists
|
return scmsync_exists
|
||||||
|
|
||||||
|
@ -83,6 +83,7 @@ class LFSOid:
|
|||||||
self.register()
|
self.register()
|
||||||
|
|
||||||
def check(self):
|
def check(self):
|
||||||
|
return True
|
||||||
url = f"http://localhost:9999/check/{self.sha256}/{self.size}"
|
url = f"http://localhost:9999/check/{self.sha256}/{self.size}"
|
||||||
response = requests.get(
|
response = requests.get(
|
||||||
url,
|
url,
|
||||||
|
@ -216,6 +216,8 @@ class TreeBuilder:
|
|||||||
def build(self, project, package):
|
def build(self, project, package):
|
||||||
"""Create a Factory tree (returning the top)"""
|
"""Create a Factory tree (returning the top)"""
|
||||||
factory_revisions = self.revisions_chain(project, package)
|
factory_revisions = self.revisions_chain(project, package)
|
||||||
|
if factory_revisions == None:
|
||||||
|
return None
|
||||||
self.add_merge_points(factory_revisions)
|
self.add_merge_points(factory_revisions)
|
||||||
# factory_revisions.print()
|
# factory_revisions.print()
|
||||||
self.prune_loose_end(factory_revisions)
|
self.prune_loose_end(factory_revisions)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user