mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-02-04 07:51:50 +00:00
* xfconf: fix existing empty array case
* fix xfconf_info as well
* add changelog frag
(cherry picked from commit b28ac655fc)
This commit is contained in:
parent
cd4a02605e
commit
40eec12c2c
4 changed files with 64 additions and 6 deletions
|
|
@ -206,10 +206,13 @@ class XFConfProperty(StateModuleHelper):
|
|||
self.do_raise('xfconf-query failed with error (rc={0}): {1}'.format(rc, err))
|
||||
|
||||
result = out.rstrip()
|
||||
if 'Value is an array with' in result:
|
||||
result = result.split('\n')
|
||||
result.pop(0)
|
||||
result.pop(0)
|
||||
if "Value is an array with" in result:
|
||||
result = result.split("\n")
|
||||
if len(result) > 1:
|
||||
result.pop(0)
|
||||
result.pop(0)
|
||||
else:
|
||||
return []
|
||||
|
||||
return result
|
||||
|
||||
|
|
|
|||
|
|
@ -153,9 +153,12 @@ class XFConfInfo(ModuleHelper):
|
|||
result = out.rstrip()
|
||||
if "Value is an array with" in result:
|
||||
result = result.split("\n")
|
||||
result.pop(0)
|
||||
result.pop(0)
|
||||
self.vars.is_array = True
|
||||
if len(result) > 1:
|
||||
result.pop(0)
|
||||
result.pop(0)
|
||||
else:
|
||||
return []
|
||||
|
||||
return result
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue