run_cmd() and friends: Make args a list[str]

This is a code maintenance commit: some run_xxx() helper functions
take a string, some a list, and some just digest all arguments and
pass them on as a list to exec() to be executed. That's highly
inconsistent. This commit changes that to list-only.

Except for the run_cmd() method of SSHClient, which is still run as a
shell method, because, erm, it's a shell. Might be changed in the
future for consistency reasons.

Signed-off-by: Jan Lindemann <jan@janware.com>

src/python/jw/pkg/cmds/distro/backend/Backend.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 from typing import TYPE_CHECKING
 
-from ....lib.util import run_cmd, run_sudo
+from ....lib.util import run_sudo
 
 if TYPE_CHECKING:
     from ..Cmd import Cmd

src/python/jw/pkg/cmds/distro/backend/Util.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 from typing import TYPE_CHECKING
 
-from ....lib.util import run_cmd, run_sudo
+from ....lib.util import run_sudo
 
 if TYPE_CHECKING:
     from ..Cmd import Cmd

src/python/jw/pkg/cmds/distro/backend/suse/Delete.py

@@ -11,4 +11,4 @@ class Delete(Base):
         super().__init__(parent)
 
     async def run(self, args: Namespace):
-        return await self.util.rpm('-e', *args.packages, sudo=True)
+        return await self.util.rpm(['-e', *args.packages], sudo=True)

src/python/jw/pkg/cmds/distro/backend/suse/Dup.py

@@ -11,4 +11,4 @@ class Dup(Base):
         super().__init__(parent)
 
     async def run(self, args: Namespace):
-        return await self.util.zypper('dup', '--force-resolution', '--auto-agree-with-licenses')
+        return await self.util.zypper(['dup', '--force-resolution', '--auto-agree-with-licenses'])

src/python/jw/pkg/cmds/distro/backend/suse/Install.py

@@ -11,4 +11,4 @@ class Install(Base):
         super().__init__(parent)
 
     async def run(self, args: Namespace):
-        return await self.util.zypper('install', *args.packages)
+        return await self.util.zypper(['install', *args.packages])

src/python/jw/pkg/cmds/distro/backend/suse/Refresh.py

@@ -11,4 +11,4 @@ class Refresh(Base):
         super().__init__(parent)
 
     async def run(self, args: Namespace):
-        return await self.util.zypper('refresh')
+        return await self.util.zypper(['refresh'])

src/python/jw/pkg/cmds/distro/backend/suse/Util.py

@@ -10,7 +10,7 @@ class Util(Base):
     def __init__(self, parent: Cmd):
         super().__init__(parent)
 
-    async def zypper(self, *args):
+    async def zypper(self, args: list[str]):
         cmd = ['/usr/bin/zypper']
         if not self.interactive:
             cmd.extend(['--non-interactive', '--gpg-auto-import-keys', '--no-gpg-checks'])
@@ -18,5 +18,5 @@ class Util(Base):
         # Run sudo --login in case /etc/profile modifies ZYPP_CONF
         return await self._sudo(cmd, opts=['--login'])
 
-    async def rpm(self, *args, sudo=False):
-        return await run_rpm(*args, sudo=sudo)
+    async def rpm(self, args: list[str], sudo=False):
+        return await run_rpm(args, sudo=sudo)

src/python/jw/pkg/cmds/distro/lib/rpm.py

@@ -6,13 +6,12 @@ from ....lib.util import run_cmd, run_sudo
 
 from .Package import Package
 
-async def run_rpm(*args, sudo=False): # export
+async def run_rpm(args: list[str], sudo: bool=False): # export
     cmd = ['/usr/bin/rpm']
     cmd.extend(args)
-    # FIXME: usage of run_xxx() (unpacked vs regular list is highly inconsistent)
     if sudo:
         return await run_sudo(cmd)
-    return await run_cmd(*cmd)
+    return await run_cmd(cmd)
 
 async def all_installed_packages() -> Iterable[Package]: # export
     ret: list[Package] = []
@@ -25,7 +24,7 @@ async def all_installed_packages() -> Iterable[Package]: # export
     opts.append('--queryformat')
     tag_str = '|'.join([f'%{{{tag}}}' for tag in query_tags]) + r'\n'
     opts.append(tag_str)
-    package_list_str, stderr = await run_rpm('-qa', *opts, sudo=False)
+    package_list_str, stderr = await run_rpm(['-qa', *opts], sudo=False)
     for package_str in package_list_str.splitlines():
         tags = package_str.split('|')
         ret.append(Package(name=tags[0], vendor=tags[1], packager=tags[2], url=tags[3]))
@@ -33,5 +32,5 @@ async def all_installed_packages() -> Iterable[Package]: # export
 
 async def list_files(pkg: str) -> list[str]: # export
     opts: list[str] = []
-    file_list_str, stderr = await run_rpm('-ql', pkg, *opts, sudo=False)
+    file_list_str, stderr = await run_rpm(['-ql', pkg, *opts], sudo=False)
     return file_list_str.splitlines()

src/python/jw/pkg/cmds/projects/CmdBuild.py

@@ -116,7 +116,7 @@ class CmdBuild(Cmd): # export
 
             try:
                 stdout, stderr = await run_cmd(
-                    *make_cmd,
+                    make_cmd,
                     wd=wd,
                     throw=True,
                     verbose=True,

src/python/jw/pkg/cmds/projects/CmdGetAuthInfo.py

@@ -29,7 +29,7 @@ class CmdGetAuthInfo(Cmd): # export
         if not os.path.isdir(jw_pkg_dir + '/.git'):
             log(DEBUG, f'jw-pkg directory is not a Git repo: {jw_pkg_dir}')
             return
-        remotes, stderr = await run_cmd('git', '-C', jw_pkg_dir, 'remote', '-v')
+        remotes, stderr = await run_cmd(['git', '-C', jw_pkg_dir, 'remote', '-v'])
         result: dict[str, str] = {}
         for line in remotes.splitlines():
             name, url, typ = re.split(r'\s+', line)