mirror of
ssh://git.janware.com/janware/proj/jw-pkg
synced 2026-04-28 21:54:34 +02:00
cmds.distro: Move all modules to lib
Functions abstracting the distribution are not only needed in the context of the distro subcommand, but also by other code, so make the bulk of the code abstracting the distribution available in some place more universally useful than below cmds.distro. This commit leaves the source files mostly unchanged. They are only patched to fix import paths, so that functionality is preserved. Refactoring the code from command-line API to library API will be done by the next commit. Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
parent
f94a2ac037
commit
7e7cee6d11
45 changed files with 44 additions and 42 deletions
14
src/python/jw/pkg/lib/distros/suse/Delete.py
Normal file
14
src/python/jw/pkg/lib/distros/suse/Delete.py
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
from argparse import Namespace
|
||||
|
||||
from ...Cmd import Cmd
|
||||
from ..BeDelete import BeDelete as Base
|
||||
|
||||
class Delete(Base):
|
||||
|
||||
def __init__(self, parent: Cmd):
|
||||
super().__init__(parent)
|
||||
|
||||
async def run(self, args: Namespace):
|
||||
return await self.util.rpm(['-e', *args.names], sudo=True)
|
||||
17
src/python/jw/pkg/lib/distros/suse/Dup.py
Normal file
17
src/python/jw/pkg/lib/distros/suse/Dup.py
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
from argparse import Namespace
|
||||
|
||||
from ...Cmd import Cmd
|
||||
from ..BeDup import BeDup as Base
|
||||
|
||||
class Dup(Base):
|
||||
|
||||
def __init__(self, parent: Cmd):
|
||||
super().__init__(parent)
|
||||
|
||||
async def run(self, args: Namespace):
|
||||
zypper_args = ['dup', '--force-resolution', '--auto-agree-with-licenses']
|
||||
if args.download_only:
|
||||
zypper_args.append('--download-only')
|
||||
return await self.util.zypper(zypper_args)
|
||||
15
src/python/jw/pkg/lib/distros/suse/Install.py
Normal file
15
src/python/jw/pkg/lib/distros/suse/Install.py
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
from argparse import Namespace
|
||||
|
||||
from ...Cmd import Cmd
|
||||
from ..BeInstall import BeInstall as Base
|
||||
|
||||
class Install(Base):
|
||||
|
||||
def __init__(self, parent: Cmd):
|
||||
super().__init__(parent)
|
||||
|
||||
async def run(self, args: Namespace):
|
||||
zypper_cmd = 'update' if args.only_update else 'install'
|
||||
return await self.util.zypper([zypper_cmd, *args.packages])
|
||||
4
src/python/jw/pkg/lib/distros/suse/Makefile
Normal file
4
src/python/jw/pkg/lib/distros/suse/Makefile
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
TOPDIR = ../../../../../../..
|
||||
|
||||
include $(TOPDIR)/make/proj.mk
|
||||
include $(JWBDIR)/make/py-mod.mk
|
||||
20
src/python/jw/pkg/lib/distros/suse/Pkg.py
Normal file
20
src/python/jw/pkg/lib/distros/suse/Pkg.py
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
from typing import Iterable
|
||||
from argparse import Namespace
|
||||
|
||||
from ...Package import Package
|
||||
from ...pm.rpm import list_files, query_packages
|
||||
from ...Cmd import Cmd
|
||||
from ..BePkg import BePkg as Base
|
||||
|
||||
class Pkg(Base):
|
||||
|
||||
def __init__(self, parent: Cmd):
|
||||
super().__init__(parent)
|
||||
|
||||
async def _files(self, name: str) -> Iterable[str]:
|
||||
return await list_files(name)
|
||||
|
||||
async def _meta_data(self, names: Iterable[str]) -> Iterable[Package]:
|
||||
return await query_packages(names)
|
||||
22
src/python/jw/pkg/lib/distros/suse/RebootRequired.py
Normal file
22
src/python/jw/pkg/lib/distros/suse/RebootRequired.py
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
from argparse import Namespace
|
||||
|
||||
from ...Cmd import Cmd
|
||||
from ..BeRebootRequired import BeRebootRequired as Base
|
||||
|
||||
class RebootRequired(Base):
|
||||
|
||||
def __init__(self, parent: Cmd):
|
||||
super().__init__(parent)
|
||||
|
||||
async def run(self, args: Namespace):
|
||||
opts = []
|
||||
if not args.verbose:
|
||||
pass
|
||||
#opts.append('--quiet')
|
||||
opts.append('needs-rebooting')
|
||||
stdout, stderr, ret = await self.util.zypper(opts, sudo=False, verbose=args.verbose)
|
||||
if ret != 0:
|
||||
return 1
|
||||
return 0
|
||||
14
src/python/jw/pkg/lib/distros/suse/Refresh.py
Normal file
14
src/python/jw/pkg/lib/distros/suse/Refresh.py
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
from argparse import Namespace
|
||||
|
||||
from ...Cmd import Cmd
|
||||
from ..BeRefresh import BeRefresh as Base
|
||||
|
||||
class Refresh(Base):
|
||||
|
||||
def __init__(self, parent: Cmd):
|
||||
super().__init__(parent)
|
||||
|
||||
async def run(self, args: Namespace):
|
||||
return await self.util.zypper(['refresh'])
|
||||
17
src/python/jw/pkg/lib/distros/suse/Select.py
Normal file
17
src/python/jw/pkg/lib/distros/suse/Select.py
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
from typing import Iterable
|
||||
from argparse import Namespace
|
||||
|
||||
from ...Package import Package
|
||||
from ...pm.rpm import query_packages
|
||||
from ...Cmd import Cmd
|
||||
from ..BeSelect import BeSelect as Base
|
||||
|
||||
class Select(Base):
|
||||
|
||||
def __init__(self, parent: Cmd):
|
||||
super().__init__(parent)
|
||||
|
||||
async def _all_installed_packages(self) -> Iterable[Package]:
|
||||
return await query_packages()
|
||||
25
src/python/jw/pkg/lib/distros/suse/Util.py
Normal file
25
src/python/jw/pkg/lib/distros/suse/Util.py
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
from ...util import run_cmd
|
||||
from ...Cmd import Cmd
|
||||
from ..Util import Util as Base
|
||||
|
||||
from ...pm.rpm import run_rpm
|
||||
|
||||
class Util(Base):
|
||||
|
||||
def __init__(self, parent: Cmd):
|
||||
super().__init__(parent)
|
||||
|
||||
async def zypper(self, args: list[str], verbose: bool=False, sudo: bool=True):
|
||||
cmd = ['/usr/bin/zypper']
|
||||
if not self.interactive:
|
||||
cmd.extend(['--non-interactive', '--gpg-auto-import-keys', '--no-gpg-checks'])
|
||||
cmd.extend(args)
|
||||
if sudo:
|
||||
# Run sudo --login in case /etc/profile modifies ZYPP_CONF
|
||||
return await self._sudo(cmd, opts=['--login'], verbose=verbose)
|
||||
return await run_cmd(cmd, verbose=verbose)
|
||||
|
||||
async def rpm(self, *args, **kwargs):
|
||||
return await run_rpm(*args, **kwargs)
|
||||
Loading…
Add table
Add a link
Reference in a new issue