a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xfconf and xfconf_info: use do_raise (#4975) 

* remove redundant XfConfException class

* adjusted indentation in the documentaiton blocks

* add changelog fragment
pull/5000/head
Alexei Znamensky 2022-07-24 22:09:24 +12:00 committed by GitHub
parent 2662bc881f
commit 31ef6c914b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changelogs/fragments/4975-xfconf-use-do-raise.yaml Normal file
View File

@ -0,0 +1,3 @@
minor_changes:
- xfconf - use ``do_raise()`` instead of defining custom exception class (https://github.com/ansible-collections/community.general/pull/4975).
- xfconf_info - use ``do_raise()`` instead of defining custom exception class (https://github.com/ansible-collections/community.general/pull/4975).

8
plugins/modules/system/xfconf.py
View File

@ -149,10 +149,6 @@ from ansible_collections.community.general.plugins.module_utils.module_helper im
from ansible_collections.community.general.plugins.module_utils.xfconf import xfconf_runner from ansible_collections.community.general.plugins.module_utils.xfconf import xfconf_runner
class XFConfException(Exception):
pass
class XFConfProperty(StateModuleHelper): class XFConfProperty(StateModuleHelper):
change_params = 'value', change_params = 'value',
diff_params = 'value', diff_params = 'value',
@ -198,7 +194,7 @@ class XFConfProperty(StateModuleHelper):
if err.rstrip() == self.does_not: if err.rstrip() == self.does_not:
return None return None
if rc or len(err): if rc or len(err):
raise XFConfException('xfconf-query failed with error (rc={0}): {1}'.format(rc, err)) self.do_raise('xfconf-query failed with error (rc={0}): {1}'.format(rc, err))
result = out.rstrip() result = out.rstrip()
if "Value is an array with" in result: if "Value is an array with" in result:
@ -231,7 +227,7 @@ class XFConfProperty(StateModuleHelper):
value_type = value_type * values_len value_type = value_type * values_len
elif types_len != values_len: elif types_len != values_len:
# or complain if lists' lengths are different # or complain if lists' lengths are different
raise XFConfException('Number of elements in "value" and "value_type" must be the same') self.do_raise('Number of elements in "value" and "value_type" must be the same')
# calculates if it is an array # calculates if it is an array
self.vars.is_array = \ self.vars.is_array = \

6
plugins/modules/system/xfconf_info.py
View File

@ -120,10 +120,6 @@ from ansible_collections.community.general.plugins.module_utils.module_helper im
from ansible_collections.community.general.plugins.module_utils.xfconf import xfconf_runner from ansible_collections.community.general.plugins.module_utils.xfconf import xfconf_runner
class XFConfException(Exception):
pass
class XFConfInfo(ModuleHelper): class XFConfInfo(ModuleHelper):
module = dict( module = dict(
argument_spec=dict( argument_spec=dict(
@ -170,8 +166,10 @@ class XFConfInfo(ModuleHelper):
elif self.vars.property is None: elif self.vars.property is None:
output = 'properties' output = 'properties'
proc = self._process_list_properties proc = self._process_list_properties
with self.runner.context('list_arg channel property', output_process=proc) as ctx: with self.runner.context('list_arg channel property', output_process=proc) as ctx:
result = ctx.run(**self.vars) result = ctx.run(**self.vars)
if not self.vars.list_arg and self.vars.is_array: if not self.vars.list_arg and self.vars.is_array:
output = "value_array" output = "value_array"
self.vars.set(output, result) self.vars.set(output, result)