Skip to content

Commit 61b80c0

Browse files
authored
Merge pull request #898 from cderici/revert-refresh-arg-name-change
#898 #### Description As per discussion in e2e60ae#commitcomment-120947922, this reverts a part of change in e2e60ae that renames an argument name from `path` -> `local_charm_path` to disambiguate the local charm path vs local resource path. However, this is a breaking change in 2.9 and requires users to run additional find/replace in their code. So this improvement will be done in a minor release on the main branch rather than breaking 2.9. #### QA Steps This is just a rename and no functionality has changed, so no QA is needed (linter is checking for typos).
2 parents 9da79d9 + ba4a62b commit 61b80c0

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

juju/application.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,7 @@ async def set_constraints(self, constraints):
623623

624624
async def refresh(
625625
self, channel=None, force=False, force_series=False, force_units=False,
626-
local_charm_path=None, resources=None, revision=None, switch=None):
626+
path=None, resources=None, revision=None, switch=None):
627627
"""Refresh the charm for this application.
628628
629629
:param str channel: Channel to use when getting the charm from the
@@ -632,13 +632,13 @@ async def refresh(
632632
application is not supported by the new charm
633633
:param bool force_units: Refresh all units immediately, even if in
634634
error state
635-
:param str local_charm_path: Refresh to a charm located at path
635+
:param str path: Refresh to a charm located at path
636636
:param dict resources: Dictionary of resource name/filepath pairs
637637
:param int revision: Explicit refresh revision
638638
:param str switch: Crossgrade charm url
639639
640640
"""
641-
if local_charm_path is None and resources is not None:
641+
if path is None and resources is not None:
642642
raise NotImplementedError("refreshing a non-local charm with resources option is not yet implemented")
643643

644644
if switch is not None and revision is not None:
@@ -660,9 +660,9 @@ async def refresh(
660660
charm_url = switch or charm_url_origin_result.url
661661
origin = charm_url_origin_result.charm_origin
662662

663-
if local_charm_path is not None:
663+
if path is not None:
664664
await self.local_refresh(origin, force, force_series,
665-
force_units, local_charm_path, resources)
665+
force_units, path, resources)
666666
return
667667

668668
parsed_url = URL.parse(charm_url)

0 commit comments

Comments
 (0)