From 38b7c80217c4e72b1d8988eb1e60bb6e77334114 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Thu, 18 Apr 2024 07:52:22 +0200
Subject: Adding upstream version 9.4.0+dfsg.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../community/general/plugins/modules/opkg.py       | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'ansible_collections/community/general/plugins/modules/opkg.py')

diff --git a/ansible_collections/community/general/plugins/modules/opkg.py b/ansible_collections/community/general/plugins/modules/opkg.py
index d2ac314d0..757c88c5d 100644
--- a/ansible_collections/community/general/plugins/modules/opkg.py
+++ b/ansible_collections/community/general/plugins/modules/opkg.py
@@ -46,6 +46,8 @@ options:
     force:
         description:
             - The C(opkg --force) parameter used.
+            - Passing V("") as value and not passing any value at all have both
+              the same effect of B(not) using any C(--force-) parameter.
         choices:
             - ""
             - "depends"
@@ -58,13 +60,17 @@ options:
             - "remove"
             - "checksum"
             - "removal-of-dependent-packages"
-        default: ""
         type: str
     update_cache:
         description:
             - Update the package DB first.
         default: false
         type: bool
+    executable:
+        description:
+            - The executable location for C(opkg).
+        type: path
+        version_added: 7.2.0
 requirements:
     - opkg
     - python
@@ -105,6 +111,7 @@ EXAMPLES = '''
     force: overwrite
 '''
 
+import os
 from ansible_collections.community.general.plugins.module_utils.cmd_runner import CmdRunner, cmd_runner_fmt
 from ansible_collections.community.general.plugins.module_utils.module_helper import StateModuleHelper
 
@@ -114,9 +121,10 @@ class Opkg(StateModuleHelper):
         argument_spec=dict(
             name=dict(aliases=["pkg"], required=True, type="list", elements="str"),
             state=dict(default="present", choices=["present", "installed", "absent", "removed"]),
-            force=dict(default="", choices=["", "depends", "maintainer", "reinstall", "overwrite", "downgrade", "space", "postinstall", "remove",
-                                            "checksum", "removal-of-dependent-packages"]),
+            force=dict(choices=["", "depends", "maintainer", "reinstall", "overwrite", "downgrade", "space",
+                                "postinstall", "remove", "checksum", "removal-of-dependent-packages"]),
             update_cache=dict(default=False, type='bool'),
+            executable=dict(type="path"),
         ),
     )
 
@@ -137,15 +145,18 @@ class Opkg(StateModuleHelper):
                 value = None
             return cmd_runner_fmt.as_optval("--force-")(value, ctx_ignore_none=True)
 
+        dir, cmd = os.path.split(self.vars.executable) if self.vars.executable else (None, "opkg")
+
         self.runner = CmdRunner(
             self.module,
-            command="opkg",
+            command=cmd,
             arg_formats=dict(
                 package=cmd_runner_fmt.as_list(),
                 state=cmd_runner_fmt.as_map(state_map),
                 force=cmd_runner_fmt.as_func(_force),
-                update_cache=cmd_runner_fmt.as_bool("update")
+                update_cache=cmd_runner_fmt.as_bool("update"),
             ),
+            path_prefix=dir,
         )
 
         if self.vars.update_cache:
-- 
cgit v1.2.3