Make pfexec become usable for illumos (#3889) (#5338)

* Experimental change from OpenIndiana * resolve pfexec problem, by removing superfluous quotes * reimplement "wrap_exe" * remove spaces arround keyword argument assignment * adapted pfexec unit test * Try to fix quoting of test expression * Fix quoting of test expression by replacing ' with " * Add changelog fragment (cherry picked from commit dc2d3c2) Co-authored-by: manschwetusCS <[email protected]>
ansible-collections · Oct 5, 2022 · cb26897 · cb26897
1 parent b7b5c18
commit cb26897
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/changelogs/fragments/3671-illumos-pfexec.yml b/changelogs/fragments/3671-illumos-pfexec.yml
@@ -0,0 +1,2 @@
+minor_changes:
+  - "become_pfexec - remove superflous quotes preventing exe wrap from working as expected, fixes #3671, see https://github.com/ansible-collections/community.general/issues/3671#issuecomment-1174906473"
diff --git a/plugins/become/pfexec.py b/plugins/become/pfexec.py
@@ -101,4 +101,4 @@ def build_become_command(self, cmd, shell):
 
         flags = self.get_option('become_flags')
         noexe = not self.get_option('wrap_exe')
-        return '%s %s "%s"' % (exe, flags, self._build_success_command(cmd, shell, noexe=noexe))
+        return '%s %s %s' % (exe, flags, self._build_success_command(cmd, shell, noexe=noexe))
diff --git a/tests/unit/plugins/become/test_pfexec.py b/tests/unit/plugins/become/test_pfexec.py
@@ -31,7 +31,7 @@ def test_pfexec_basic(mocker, parser, reset_cli_args):
     var_options = {}
     cmd = call_become_plugin(task, var_options, cmd=default_cmd, executable=default_exe)
     print(cmd)
-    assert re.match('''%s %s "'echo %s; %s'"''' % (pfexec_exe, pfexec_flags, success, default_cmd), cmd) is not None
+    assert re.match("""%s %s 'echo %s; %s'""" % (pfexec_exe, pfexec_flags, success, default_cmd), cmd) is not None
 
 
 def test_pfexec(mocker, parser, reset_cli_args):
@@ -53,7 +53,7 @@ def test_pfexec(mocker, parser, reset_cli_args):
     var_options = {}
     cmd = call_become_plugin(task, var_options, cmd=default_cmd, executable=default_exe)
     print(cmd)
-    assert re.match('''%s %s "'echo %s; %s'"''' % (pfexec_exe, pfexec_flags, success, default_cmd), cmd) is not None
+    assert re.match("""%s %s 'echo %s; %s'""" % (pfexec_exe, pfexec_flags, success, default_cmd), cmd) is not None
 
 
 def test_pfexec_varoptions(mocker, parser, reset_cli_args):
@@ -78,4 +78,4 @@ def test_pfexec_varoptions(mocker, parser, reset_cli_args):
     }
     cmd = call_become_plugin(task, var_options, cmd=default_cmd, executable=default_exe)
     print(cmd)
-    assert re.match('''%s %s "'echo %s; %s'"''' % (pfexec_exe, pfexec_flags, success, default_cmd), cmd) is not None
+    assert re.match("""%s %s 'echo %s; %s'""" % (pfexec_exe, pfexec_flags, success, default_cmd), cmd) is not None
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		minor_changes:
		- "become_pfexec - remove superflous quotes preventing exe wrap from working as expected, fixes #3671, see https://github.com/ansible-collections/community.general/issues/3671#issuecomment-1174906473"