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

fixes latest state

Browse source
This commit is contained in:
Stanislav Shamilov 2024-12-06 19:40:04 +02:00
commit de6f740af8
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plugins/modules/android_sdk.py
View file

@ -40,7 +40,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(packages) rc, stdout, stderr = self.sdkmanager.install_packages(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)
@ -50,7 +50,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(packages) rc, stdout, stderr = self.sdkmanager.uninstall_packages(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)
@ -59,11 +59,11 @@ class AndroidSdk(StateModuleHelper):
installed = self.sdkmanager.get_installed_packages() installed = self.sdkmanager.get_installed_packages()
updatable = self.sdkmanager.get_updatable_packages() updatable = self.sdkmanager.get_updatable_packages()
not_installed = packages.difference(installed) not_installed = packages.difference(installed)
to_be_installed = not_installed.intersection(updatable) to_be_installed = not_installed.union(updatable)
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(packages) rc, stdout, stderr = self.sdkmanager.install_packages(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)