Skip to content

Commit 7417063

Browse files
author
Gabriele Musco
committed
poetry: support for poetry metadata format 2.0
1 parent 06e1d80 commit 7417063

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

poetry/flatpak-poetry-generator.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@ def get_module_sources(parsed_lockfile: dict, include_devel: bool = True) -> lis
7070
or package["category"] == "main"
7171
and not package["optional"]
7272
):
73+
hashes = []
7374
# Check for old metadata format (poetry version < 1.0.0b2)
7475
if "hashes" in parsed_lockfile["metadata"]:
7576
hashes = parsed_lockfile["metadata"]["hashes"][package["name"]]
76-
# Else new metadata format
77-
else:
78-
hashes = []
77+
# metadata format 1.1
78+
elif "files" in parsed_lockfile["metadata"]:
7979
for package_name in parsed_lockfile["metadata"]["files"]:
8080
if package_name == package["name"]:
8181
package_files = parsed_lockfile["metadata"]["files"][
@@ -86,6 +86,12 @@ def get_module_sources(parsed_lockfile: dict, include_devel: bool = True) -> lis
8686
match = hash_re.search(package_files[num]["hash"])
8787
if match:
8888
hashes.append(match.group(2))
89+
# metadata format 2.0
90+
else:
91+
for file in package["files"]:
92+
match = hash_re.search(file["hash"])
93+
if match:
94+
hashes.append(match.group(2))
8995
url, hash = get_pypi_source(
9096
package["name"], package["version"], hashes
9197
)

0 commit comments

Comments
 (0)