D8637.id31182.diff
No OneTemporary
Actions

Size

1 KB

Subscribers

None

D8637.id31182.diff
View Options

	diff --git a/swh/lister/nixguix/lister.py b/swh/lister/nixguix/lister.py
	--- a/swh/lister/nixguix/lister.py
	+++ b/swh/lister/nixguix/lister.py
	@@ -430,6 +430,15 @@
	# the output can be anything, including a directory tree.
	outputHashMode = artifact.get("outputHashMode", "flat")

	+ if not is_tar and outputHashMode == "recursive":
	+ # T4608: We cannot deal with those properly yet
	+ logger.warning(
	+ "Skipping artifact <%s>: Not ready %s",
	+ artifact,
	+ artifact_type,
	+ )
	+ continue
	+
	logger.debug("%s: %s", "dir" if is_tar else "cnt", origin)
	yield ArtifactType.ARTIFACT, Artifact(
	origin=origin,
	diff --git a/swh/lister/nixguix/tests/data/sources-failure.json b/swh/lister/nixguix/tests/data/sources-failure.json
	--- a/swh/lister/nixguix/tests/data/sources-failure.json
	+++ b/swh/lister/nixguix/tests/data/sources-failure.json
	@@ -37,6 +37,17 @@
	],
	"inferredFetcher": "fetchzip"
	},
	+ {
	+ "outputHash": "0s2mvy1nr2v1x0rr1fxlsv8ly1vyf9978rb4hwry5vnr678ls522",
	+ "outputHashAlgo": "sha256",
	+ "outputHashMode": "recursive",
	+ "type": "url",
	+ "urls": [
	+ "https://www.unicode.org/Public/emoji/12.1/emoji-zwj-sequences.txt"
	+ ],
	+ "integrity": "sha256-QhRN0THZ7uIzh2RldFJyfgdP0da0u5Az6GGLbIPfVWg=",
	+ "inferredFetcher": "unclassified"
	+ },
	{
	"type": "url",
	"urls": [ "unknown://example.org/wrong-scheme-so-skipped.txt" ],