D3301.id.diff
No OneTemporary
Actions

Size

1 KB

Subscribers

None

D3301.id.diff
View Options

	diff --git a/requirements-swh.txt b/requirements-swh.txt
	--- a/requirements-swh.txt
	+++ b/requirements-swh.txt
	@@ -2,5 +2,5 @@
	swh.model >= 0.0.15
	swh.objstorage >= 0.0.43
	swh.scheduler >= 0.0.47
	-swh.storage >= 0.3.0
	+swh.storage >= 0.6.0
	swh.journal >= 0.1.0
	diff --git a/swh/indexer/origin_head.py b/swh/indexer/origin_head.py
	--- a/swh/indexer/origin_head.py
	+++ b/swh/indexer/origin_head.py
	@@ -10,6 +10,7 @@
	import logging

	from swh.indexer.indexer import OriginIndexer
	+from swh.storage.algos.origin import origin_get_latest_visit_status


	class OriginHeadIndexer(OriginIndexer):
	@@ -32,14 +33,17 @@
	# Dispatch

	def index(self, origin_url):
	- latest_visit = self.storage.origin_visit_get_latest(
	- origin_url, allowed_statuses=["full"], require_snapshot=True
	+ visit_and_status = origin_get_latest_visit_status(
	+ self.storage, origin_url, allowed_statuses=["full"], require_snapshot=True
	)
	- if latest_visit is None:
	+ if not visit_and_status:
	+ return None
	+ visit, visit_status = visit_and_status
	+ latest_snapshot = self.storage.snapshot_get(visit_status.snapshot)
	+ if latest_snapshot is None:
	return None
	- latest_snapshot = self.storage.snapshot_get(latest_visit["snapshot"])
	method = getattr(
	- self, "_try_get_%s_head" % latest_visit["type"], self._try_get_head_generic
	+ self, "_try_get_%s_head" % visit.type, self._try_get_head_generic
	)

	rev_id = method(latest_snapshot)