Skip to content

Commit 2a58446

Browse files
committed
fixing free variable -- add_charm_res
1 parent fd2499d commit 2a58446

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

juju/model.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1597,6 +1597,7 @@ async def deploy(
15971597
# actually support them yet anyway
15981598
if not res.is_local:
15991599
add_charm_res = await self._add_charm(identifier, res.origin)
1600+
charm_origin = add_charm_res.charm_origin
16001601

16011602
if Schema.CHARM_HUB.matches(url.schema):
16021603
resources = await self._add_charmhub_resources(res.app_name,
@@ -1610,6 +1611,7 @@ async def deploy(
16101611
# We have a local charm dir that needs to be uploaded
16111612
charm_dir = os.path.abspath(
16121613
os.path.expanduser(identifier))
1614+
charm_origin = res.origin
16131615
metadata = utils.get_local_charm_metadata(charm_dir)
16141616
if not application_name:
16151617
application_name = metadata['name']
@@ -1648,7 +1650,7 @@ async def deploy(
16481650
num_units=num_units,
16491651
placement=parse_placement(to),
16501652
devices=devices,
1651-
charm_origin=add_charm_res.charm_origin,
1653+
charm_origin=charm_origin
16521654
)
16531655

16541656
async def _add_charm(self, charm_url, origin):

0 commit comments

Comments
 (0)