ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-21 04:10:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

removes excessive methods from sdkmanager

Browse source
This commit is contained in:
Stanislav Shamilov 2024-12-09 14:10:26 +02:00
commit e8ef594c42
2 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
plugins/module_utils/sdkmanager.py
View file

@ -136,20 +136,15 @@ class AndroidSdkManager(object):
package = unknown_package_regex.group('package') package = unknown_package_regex.group('package')
raise SdkManagerException("Unknown package %s" % package) raise SdkManagerException("Unknown package %s" % package)
def install_packages(self, packages): def apply_packages_changes(self, packages):
return self.apply_packages_changes(packages, 'present') """ Install or delete packages, depending on the `module.vars.state` parameter """
def uninstall_packages(self, packages):
return self.apply_packages_changes(packages, 'absent')
def apply_packages_changes(self, packages, state):
if len(packages) == 0: if len(packages) == 0:
return 0, '', '' return 0, '', ''
command_arg = [x.name for x in packages] command_arg = [x.name for x in packages]
data = 'N' # Answer 'No' in case sdkmanager wants us to accept license data = 'N' # Answer 'No' in case sdkmanager wants us to accept license
with self.runner('state name sdk_root channel', data=data) as ctx: 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') data = stdout.split('\n')

6
plugins/modules/android_sdk.py
View file

@ -60,7 +60,7 @@ class AndroidSdk(StateModuleHelper):
self.vars.installed = AndroidSdk._map_packages_to_names(pending_installation) self.vars.installed = AndroidSdk._map_packages_to_names(pending_installation)
if not self.check_mode: 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: if rc != 0:
self.do_raise("Could not install packages: %s" % stderr) self.do_raise("Could not install packages: %s" % stderr)
@ -70,7 +70,7 @@ class AndroidSdk(StateModuleHelper):
to_be_deleted = packages.intersection(installed) to_be_deleted = packages.intersection(installed)
self.vars.removed = AndroidSdk._map_packages_to_names(to_be_deleted) self.vars.removed = AndroidSdk._map_packages_to_names(to_be_deleted)
if not self.check_mode: 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: if rc != 0:
self.do_raise("Could not uninstall packages: %s" % stderr) 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) self.vars.installed = AndroidSdk._map_packages_to_names(to_be_installed)
if not self.check_mode: 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: if rc != 0:
self.do_raise("Could not install packages: %s" % stderr) self.do_raise("Could not install packages: %s" % stderr)