D2836.diff
No OneTemporary
Actions

Size

1 KB

Subscribers

None

D2836.diff
View Options

	diff --git a/swh/journal/replay.py b/swh/journal/replay.py
	--- a/swh/journal/replay.py
	+++ b/swh/journal/replay.py
	@@ -68,6 +68,23 @@
	notify('WATCHDOG=1')


	+def _fix_contents(
	+ contents: Iterable[Dict[str, Any]]) -> Iterable[Dict[str, Any]]:
	+ """Filters-out invalid 'perms' key that leaked from swh.model.from_disk
	+ to the journal.
	+
	+ >>> list(_fix_contents([
	+ ... {'perms': 0o100644, 'sha1_git': b'foo'},
	+ ... {'sha1_git': b'bar'},
	+ ... ]))
	+ [{'sha1_git': b'foo'}, {'sha1_git': b'bar'}]
	+ """
	+ for content in contents:
	+ content = content.copy()
	+ content.pop('perms', None)
	+ yield content
	+
	+
	def _fix_revision_pypi_empty_string(rev):
	"""PyPI loader failed to encode empty strings as bytes, see:
	swh:1:rev:8f0095ee0664867055d03de9bcc8f95b91d8a2b9
	@@ -309,7 +326,7 @@
	if object_type == 'content':
	contents: List[BaseContent] = []
	skipped_contents: List[BaseContent] = []
	- for content in objects:
	+ for content in _fix_contents(objects):
	c = BaseContent.from_dict(content)
	if isinstance(c, SkippedContent):
	skipped_contents.append(c)