diff --git a/plugins/module_utils/sdkmanager.py b/plugins/module_utils/sdkmanager.py index cc4715223d..34e7cc168b 100644 --- a/plugins/module_utils/sdkmanager.py +++ b/plugins/module_utils/sdkmanager.py @@ -136,20 +136,15 @@ class AndroidSdkManager(object): package = unknown_package_regex.group('package') raise SdkManagerException("Unknown package %s" % package) - def install_packages(self, packages): - return self.apply_packages_changes(packages, 'present') - - def uninstall_packages(self, packages): - return self.apply_packages_changes(packages, 'absent') - - def apply_packages_changes(self, packages, state): + def apply_packages_changes(self, packages): + """ Install or delete packages, depending on the `module.vars.state` parameter """ if len(packages) == 0: return 0, '', '' command_arg = [x.name for x in packages] data = 'N' # Answer 'No' in case sdkmanager wants us to accept license with self.runner('state name sdk_root channel', data=data) as ctx: - rc, stdout, stderr = ctx.run(name=command_arg, state=state, data=data) + rc, stdout, stderr = ctx.run(name=command_arg, data=data) data = stdout.split('\n') diff --git a/plugins/modules/android_sdk.py b/plugins/modules/android_sdk.py index 09a233b519..7923589d0f 100644 --- a/plugins/modules/android_sdk.py +++ b/plugins/modules/android_sdk.py @@ -60,7 +60,7 @@ class AndroidSdk(StateModuleHelper): self.vars.installed = AndroidSdk._map_packages_to_names(pending_installation) if not self.check_mode: - rc, stdout, stderr = self.sdkmanager.install_packages(pending_installation) + rc, stdout, stderr = self.sdkmanager.apply_packages_changes(pending_installation) if rc != 0: self.do_raise("Could not install packages: %s" % stderr) @@ -70,7 +70,7 @@ class AndroidSdk(StateModuleHelper): to_be_deleted = packages.intersection(installed) self.vars.removed = AndroidSdk._map_packages_to_names(to_be_deleted) if not self.check_mode: - rc, stdout, stderr = self.sdkmanager.uninstall_packages(to_be_deleted) + rc, stdout, stderr = self.sdkmanager.apply_packages_changes(to_be_deleted) if rc != 0: self.do_raise("Could not uninstall packages: %s" % stderr) @@ -83,7 +83,7 @@ class AndroidSdk(StateModuleHelper): self.vars.installed = AndroidSdk._map_packages_to_names(to_be_installed) if not self.check_mode: - rc, stdout, stderr = self.sdkmanager.install_packages(to_be_installed) + rc, stdout, stderr = self.sdkmanager.apply_packages_changes(to_be_installed) if rc != 0: self.do_raise("Could not install packages: %s" % stderr)