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

packages to be installed is not checked

Browse source
This commit is contained in:
JerryXiao 2021-07-11 15:31:21 +08:00
parent 2a716bef60
commit 111a712fee
Signed by: Jerry
GPG key ID: 22618F758B5BE2E5
1 changed files with 34 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/pacroller/main.py
View file

@ -68,9 +68,10 @@ def sync() -> None:
def upgrade(interactive=False) -> List[str]: def upgrade(interactive=False) -> List[str]:
logger.info('upgrade start') logger.info('upgrade start')
check_upgrade_cmd = ['pacman', '-Qu', '--color', 'never'] query_upgrade_cmd = ['pacman', '-Qu', '--color', 'never']
p = subprocess.run( sync_upgrade_cmd = ['pacman', '-Su', '--print-format', '%n %v', '--color', 'never']
check_upgrade_cmd, qp = subprocess.run(
query_upgrade_cmd,
stdin=subprocess.DEVNULL, stdin=subprocess.DEVNULL,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.STDOUT, stderr=subprocess.STDOUT,
@ -78,10 +79,20 @@ def upgrade(interactive=False) -> List[str]:
timeout=TIMEOUT, timeout=TIMEOUT,
check=False check=False
) )
if p.returncode != 1: if qp.returncode != 1:
p.check_returncode() qp.check_returncode()
sp = subprocess.run(
sync_upgrade_cmd,
stdin=subprocess.DEVNULL,
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT,
encoding='utf-8',
timeout=TIMEOUT,
check=True
)
upgrade_pkgnames = list()
upgrade_pkgs = list() upgrade_pkgs = list()
for line in filter(None, p.stdout.split('\n')): for line in filter(None, qp.stdout.split('\n')):
pkgname, over, _ar, nver, *ignored = line.split() pkgname, over, _ar, nver, *ignored = line.split()
assert _ar == '->' assert _ar == '->'
assert not ignored or (len(ignored) == 1 and ignored[0] == "[ignored]") assert not ignored or (len(ignored) == 1 and ignored[0] == "[ignored]")
@ -90,6 +101,12 @@ def upgrade(interactive=False) -> List[str]:
else: else:
logger.debug(f"upgrade: {pkgname} {over} -> {nver}") logger.debug(f"upgrade: {pkgname} {over} -> {nver}")
upgrade_pkgs.append((pkgname, over, nver)) upgrade_pkgs.append((pkgname, over, nver))
upgrade_pkgnames.append(pkgname)
for line in filter(None, sp.stdout.split('\n')):
pkgname, nver = line.split()
if pkgname not in upgrade_pkgnames:
logger.debug(f"install: {pkgname} {nver}")
upgrade_pkgs.append((pkgname, '', nver))
if not upgrade_pkgs: if not upgrade_pkgs:
logger.info('upgrade end, nothing to do') logger.info('upgrade end, nothing to do')
exit(0) exit(0)
@ -98,15 +115,18 @@ def upgrade(interactive=False) -> List[str]:
errors = list() errors = list()
for pkgname, over, nver in upgrade_pkgs: for pkgname, over, nver in upgrade_pkgs:
if _testreg := HOLD.get(pkgname): if _testreg := HOLD.get(pkgname):
_m_old = match(_testreg, over) if over:
_m_new = match(_testreg, nver) _m_old = match(_testreg, over)
if _m_old and _m_new: _m_new = match(_testreg, nver)
if (o := _m_old.groups()) != (n := _m_new.groups()): if _m_old and _m_new:
errors.append(f"hold package {pkgname} is going to be upgraded from {o=} to {n=}") if (o := _m_old.groups()) != (n := _m_new.groups()):
if not o or not n: errors.append(f"hold package {pkgname} is going to be upgraded from {over} to {nver}")
errors.append(f"hold package {pkgname}: version regex missing matching groups {o=} {n=}") if not o or not n:
errors.append(f"hold package {pkgname}: version regex missing matching groups {over=} {nver=} {o=} {n=}")
else:
errors.append(f"cannot match version regex for hold package {pkgname}")
else: else:
errors.append(f"cannot match version regex for hold package {pkgname}") errors.append(f"hold package {pkgname} {nver} is going to be installed")
if errors: if errors:
raise PackageHold(errors) raise PackageHold(errors)
except PackageHold as e: except PackageHold as e: