Page Menu
Home
Software Heritage
Search
Configure Global Search
Log In
Files
F9312525
D8607.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
1 KB
Subscribers
None
D8607.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
@@ -25,6 +25,7 @@
from urllib.parse import urlparse
import requests
+from requests.exceptions import InvalidSchema, SSLError
from swh.core.github.utils import GitHubSession
from swh.core.tarball import MIMETYPE_TO_ARCHIVE_FORMAT
@@ -155,7 +156,7 @@
try:
response = request.head(url)
- except requests.exceptions.InvalidSchema:
+ except (InvalidSchema, SSLError):
raise ArtifactNatureUndetected(
f"Cannot determine artifact type from url <{url}>"
)
diff --git a/swh/lister/nixguix/tests/data/guix-swh_sources.json b/swh/lister/nixguix/tests/data/guix-swh_sources.json
--- a/swh/lister/nixguix/tests/data/guix-swh_sources.json
+++ b/swh/lister/nixguix/tests/data/guix-swh_sources.json
@@ -24,6 +24,11 @@
"type": "url",
"urls": [ "unknown://example.org/wrong-scheme-so-skipped.txt" ],
"integrity": "sha256-wAEswtkl3ulAw3zq4perrGS6Wlww5XXnQYsEAoYT9fI="
+ },
+ {
+ "type": "url",
+ "urls": [ "https://code.9front.org/hg/plan9front" ],
+ "integrity": "sha256-wAEswtkl3ulAw3zq4perrGS6Wlww5XXnQYsEAoYT9fI="
}
],
"version":"1",
diff --git a/swh/lister/nixguix/tests/test_lister.py b/swh/lister/nixguix/tests/test_lister.py
--- a/swh/lister/nixguix/tests/test_lister.py
+++ b/swh/lister/nixguix/tests/test_lister.py
@@ -235,6 +235,11 @@
"ftp://ftp.ourproject.org/file-with-no-extension",
exc=requests.exceptions.InvalidSchema,
)
+ # Cannot communicate with an expired cert so skip
+ requests_mock.head(
+ "https://code.9front.org/hg/plan9front",
+ exc=requests.exceptions.SSLError,
+ )
listed_result = lister.run()
# only the origin upstream is listed, every other entries are unsupported or incomplete
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Wed, Jul 2, 10:56 AM (1 w, 5 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3216785
Attached To
D8607: nixguix: Deal with impossible communication with server
Event Timeline
Log In to Comment