Skip to content

Commit

Permalink
Fix merge.
Browse files Browse the repository at this point in the history
  • Loading branch information
tonyandrewmeyer committed Jul 9, 2024
1 parent 4789350 commit 8ca4048
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions scenario/state.py
Original file line number Diff line number Diff line change
Expand Up @@ -1208,10 +1208,10 @@ def __post_init__(self):
Storage(name=storage.name, index=storage.index)
if isinstance(storage, ops.Storage)
else storage
for storage in self.storage
for storage in self.storages
]
if self.storage != normalised_storage:
object.__setattr__(self, "storage", normalised_storage)
if self.storages != normalised_storage:
object.__setattr__(self, "storages", normalised_storage)
# ops.Container, ops.Model, ops.Relation, ops.Secret should not be instantiated by charmers.
# ops.Network does not have the relation name, so cannot be converted.
# ops.Resources does not contain the source of the resource, so cannot be converted.
Expand Down

0 comments on commit 8ca4048

Please sign in to comment.