PaganOS Luna 0.6.0
PL EN DE
← pag

Commit 00534eb

0
files
+0
added
-0
deleted
@@ -3853,9 +3853,12 @@ def cmd_base_adopt(args):
3853 3853 _size = sum(repo[r].size_bytes for _i, r, _v in plan if r in repo)
3854 3854 print(f"\n {_('base_adopt_plan', len(plan), _size / 1048576)}")
3855 3855 for _iso_n, _real, _v in plan[:20]:
3856 - _rv = repo[_real].version if _real in repo else "?"
3856 + _p = repo.get(_real)
3857 + _rv = _p.version if _p else "?"
3858 + _rr = (getattr(_p, "release", "") or "") if _p else ""
3859 + _rvr = f"{_rv}-{_rr}" if _rr else _rv
3857 3860 _m = "" if _iso_n == _real else f" ({_iso_n} → {_real})"
3858 - print(f" {_real}: {_v} → {_rv}{_m}")
3861 + print(f" {_real}: {_v} → {_rvr}{_m}")
3859 3862 if len(plan) > 20:
3860 3863 print(f" … {len(plan) - 20} {_('base_more')}")
3861 3864 if "-n" in args or "--dry-run" in args:
@@ -4004,7 +4007,12 @@ def cmd_update(do_upgrade: bool = False):
4004 4007 installed = load_json(INSTALLED_DB)
4005 4008 repo = fetch_all_packages()
4006 4009 for n in pending:
4007 - print(f" {n}: {installed.get(n, {}).get('version', '?')} → {repo[n].version}")
4010 + _i = installed.get(n, {})
4011 + _ir = _i.get("release")
4012 + _nr = getattr(repo[n], "release", "") or ""
4013 + _old = f"{_i.get('version', '?')}-{_ir}" if _ir else _i.get("version", "?")
4014 + _new = f"{repo[n].version}-{_nr}" if _nr else repo[n].version
4015 + print(f" {n}: {_old} → {_new}")
4008 4016 if not do_upgrade:
4009 4017 _base_hint_unmanaged()
4010 4018 return 0 # sync: tylko informacja