Skip to content

Commit 81ea905

Browse files
authored
Merge pull request #504 from juju/johnsca/lp-1929076/fix-series-metadata-v2
#504 Local charms may no longer need a series if they are metadata v2 container charms. The Juju CLI uses the model default instead. Fixes [lp:1929076][] [lp:1929076]: https://bugs.launchpad.net/juju/+bug/1929076
2 parents dce2e01 + b9776db commit 81ea905

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

juju/model.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1481,6 +1481,11 @@ async def deploy(
14811481
charm_dir = os.path.abspath(
14821482
os.path.expanduser(entity_id))
14831483
series = series or get_charm_series(charm_dir)
1484+
if not series:
1485+
model_config = await self.get_config()
1486+
default_series = model_config.get("default-series")
1487+
if default_series:
1488+
series = default_series.value
14841489
if not series:
14851490
raise JujuError(
14861491
"Couldn't determine series for charm at {}. "

0 commit comments

Comments
 (0)