Skip to content

Commit c026476

Browse files
committed
fixing model _add_charmhub_resources
1 parent 2a58446 commit c026476

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

juju/model.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1741,8 +1741,12 @@ async def _add_charmhub_resources(self, application,
17411741
resources=[client.CharmResource(**resource) for resource in resources],
17421742
)
17431743

1744-
resource_map = {resource['name']: resource['pending_id']
1745-
for resource in resources}
1744+
# response.pending_ids always exists but it can itself be None
1745+
# see juju/client/_definitions.py for AddPendingResourcesResult
1746+
resource_map = {resource['name']: pid
1747+
for resource, pid
1748+
in zip(resources, response.pending_ids or {})}
1749+
17461750
return resource_map
17471751

17481752
async def _add_store_resources(self, application, entity_url,

0 commit comments

Comments
 (0)