Jerry/pacroller
1
0
Fork 0
mirror of https://github.com/isjerryxiao/pacroller.git synced 2024-11-26 01:30:42 +08:00
Code Issues Projects Releases Packages Wiki Activity

various fixes

Browse source
This commit is contained in:
JerryXiao 2021-01-16 01:02:37 +08:00
parent 7083d4b41b
commit fc23239e30
Signed by: Jerry
GPG key ID: 9D9CE43650FF2BAA
4 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/pacroller/checker.py
View file

@ -30,7 +30,7 @@ REGEX: Dict[str, Pattern] # get through lint
class checkReport: class checkReport:
def __init__(self, info: List[str] = None, warn: List[str] = None, def __init__(self, info: List[str] = None, warn: List[str] = None,
crit: List[str] = None, changes: List[Tuple[str]] = None, crit: List[str] = None, changes: List[Tuple[str]] = None,
date: int = int(time)) -> None: date: int = int(time())) -> None:
self._info = info or list() self._info = info or list()
self._warn = warn or list() self._warn = warn or list()
self._crit = crit or list() self._crit = crit or list()
@ -86,7 +86,7 @@ class checkReport:
ret.append("Package changes:") ret.append("Package changes:")
ret.extend([" " * indent + i for i in pkg_ret]) ret.extend([" " * indent + i for i in pkg_ret])
if len(ret) == 1: if len(ret) == 1:
ret.append('all systems go') ret.append('nothing to show')
return "\n".join(ret) return "\n".join(ret)
def info(self, text: str) -> None: def info(self, text: str) -> None:
logger.debug(f'report info {text}') logger.debug(f'report info {text}')
@ -229,7 +229,7 @@ def _log_parser(log: List[str], report: checkReport) -> None:
report.crit(f'ALPM {line=} is unknown') report.crit(f'ALPM {line=} is unknown')
elif source == 'ALPM-SCRIPTLET': elif source == 'ALPM-SCRIPTLET':
(_, _, _pmsg) = _split_log_line(log[ln-1]) (_, _, _pmsg) = _split_log_line(log[ln-1])
if _m := REGEX['s_upgrade_pkg'].match(_pmsg): if _m := REGEX['l_upgrade'].match(_pmsg):
pkg, *_ = _m.groups() pkg, *_ = _m.groups()
elif _m := REGEX['l_install'].match(_pmsg): elif _m := REGEX['l_install'].match(_pmsg):
pkg, *_ = _m.groups() pkg, *_ = _m.groups()
@ -237,6 +237,8 @@ def _log_parser(log: List[str], report: checkReport) -> None:
pkg, *_ = _m.groups() pkg, *_ = _m.groups()
else: else:
report.crit(f'{line=} has unknown SCRIPTLET output') report.crit(f'{line=} has unknown SCRIPTLET output')
ln += 1
continue
logger.debug(f'.install start {pkg=}') logger.debug(f'.install start {pkg=}')
while True: while True:
ln += 1 ln += 1

8
src/pacroller/config.json.example
View file

@ -8,9 +8,9 @@
"hold": { "hold": {
"linux": "(.*)", "linux": "(.*)",
"python": "[0-9]+[.]([0-9]+)[.][0-9]+[-][0-9]+" "python": "[0-9]+[.]([0-9]+)[.][0-9]+[-][0-9]+"
} },
'ignored_pacnew': [ "ignored_pacnew": [
'/etc/locale.gen', "/etc/locale.gen",
'/etc/pacman.d/mirrorlist' "/etc/pacman.d/mirrorlist"
] ]
} }

2
src/pacroller/config.py
View file

@ -27,7 +27,7 @@ EXTRA_SAFE = bool(_config.get('extra_safe', False))
SHELL = str(_config.get('shell', '/bin/bash')) SHELL = str(_config.get('shell', '/bin/bash'))
HOLD = _config.get('hold', dict()) HOLD = _config.get('hold', dict())
for (k, v) in HOLD: for (k, v) in HOLD.items():
assert isinstance(k, str) and isinstance(v, str) assert isinstance(k, str) and isinstance(v, str)
IGNORED_PACNEW = _config.get('ignored_pacnew', list()) IGNORED_PACNEW = _config.get('ignored_pacnew', list())

3
src/pacroller/main.py
View file

@ -68,8 +68,8 @@ class alpmCallback:
def upgrade() -> List[str]: def upgrade() -> List[str]:
logger.info('upgrade start') logger.info('upgrade start')
handle = pycman.config.init_with_config(PACMAN_CONFIG)
pycman.config.cb_log = lambda *_: None pycman.config.cb_log = lambda *_: None
handle = pycman.config.init_with_config(PACMAN_CONFIG)
localdb = handle.get_localdb() localdb = handle.get_localdb()
alpmCallback().setup_hdl(handle) alpmCallback().setup_hdl(handle)
t = handle.init_transaction() t = handle.init_transaction()
@ -77,6 +77,7 @@ def upgrade() -> List[str]:
t.sysupgrade(False) # no downgrade t.sysupgrade(False) # no downgrade
if len(t.to_add) + len(t.to_remove) == 0: if len(t.to_add) + len(t.to_remove) == 0:
logger.info('upgrade end, nothing to do') logger.info('upgrade end, nothing to do')
exit(0)
else: else:
def examine_upgrade(toadd: List[pyalpm.Package], toremove: List[pyalpm.Package]) -> None: def examine_upgrade(toadd: List[pyalpm.Package], toremove: List[pyalpm.Package]) -> None:
for pkg in toadd: for pkg in toadd: