@@ -773,19 +773,22 @@ async def refresh(
773773 else :
774774 resource_ids = None
775775
776+ set_charm_args = {
777+ 'application' : self .entity_id ,
778+ 'charm_url' : charm_url ,
779+ 'charm_origin' : dest_origin ,
780+ 'config_settings' : None ,
781+ 'config_settings_yaml' : None ,
782+ 'force' : force ,
783+ 'force_units' : force_units ,
784+ 'resource_ids' : resource_ids ,
785+ 'storage_constraints' : None ,
786+ }
787+ if self .connection .is_using_old_client :
788+ set_charm_args ['force_series' ] = force_series
789+
776790 # Update the application
777- await app_facade .SetCharm (
778- application = self .entity_id ,
779- charm_url = charm_url ,
780- charm_origin = dest_origin ,
781- config_settings = None ,
782- config_settings_yaml = None ,
783- force = force ,
784- force_series = force_series ,
785- force_units = force_units ,
786- resource_ids = resource_ids ,
787- storage_constraints = None ,
788- )
791+ await app_facade .SetCharm (** set_charm_args )
789792
790793 await self .model .block_until (
791794 lambda : self .data ['charm-url' ] == charm_url
@@ -835,19 +838,23 @@ async def local_refresh(
835838 metadata ,
836839 resources = resources )
837840
841+ set_charm_args = {
842+ 'application' : self .entity_id ,
843+ 'charm_origin' : charm_origin ,
844+ 'charm_url' : charm_url ,
845+ 'config_settings' : None ,
846+ 'config_settings_yaml' : None ,
847+ 'force' : force ,
848+ 'force_units' : force_units ,
849+ 'resource_ids' : resources ,
850+ 'storage_constraints' : None ,
851+ }
852+
853+ if self .connection .is_using_old_client :
854+ set_charm_args ['force_series' ] = force_series
855+
838856 # Update application
839- await app_facade .SetCharm (
840- application = self .entity_id ,
841- charm_origin = charm_origin ,
842- charm_url = charm_url ,
843- config_settings = None ,
844- config_settings_yaml = None ,
845- force = force ,
846- force_series = force_series ,
847- force_units = force_units ,
848- resource_ids = resources ,
849- storage_constraints = None ,
850- )
857+ await app_facade .SetCharm (** set_charm_args )
851858
852859 await self .model .block_until (
853860 lambda : self .data ['charm-url' ] == charm_url
0 commit comments