Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Avoid a nasty crash if a package has a malformed version string #97

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Avoid a nasty crash if a package has a malformed version string #97

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e1cdaa
Avoid a nasty crash if a package has a malformed version string
sheepman4267 Nov 4, 2024
88a051a
atomicoperations: Only compare distribution release
ermo Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 24 additions & 19 deletions pisi/atomicoperations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,39 +270,44 @@ def check_operation(self):
ipkg = self.installdb.get_package(pkg.name)
(iversion_s, irelease_s, ibuild) = self.installdb.get_version(pkg.name)

# determine if same version
# determine if same distribution release
if pkg.release == irelease_s:
if self.ask_reinstall:
if not ctx.ui.confirm(_("Re-install same version package?")):
raise Error(_("Package re-install declined"))
if not ctx.ui.confirm("Re-install same distribution release of package?"):
raise Error("Package re-install declined")
self.operation = REINSTALL
else:
pkg_version = pisi.version.make_version(pkg.version)
iversion = pisi.version.make_version(iversion_s)

pkg_release = int(pkg.release)
irelease = int(irelease_s)
#pkg_version = pisi.version.make_version(pkg.version)
#ctx.ui.debug(f"New upstream version after version parsing: {pkg_version}")
#iversion = pisi.version.make_version(iversion_s)
#ctx.ui.debug(f"Installed version after version parsing: {iversion}")
#pkg_release = int(pkg.release)
#irelease = int(irelease_s)

# is this an upgrade?
# determine and report the kind of upgrade: version, release
if pkg_version > iversion:
ctx.ui.info(_("Upgrading to new upstream version"))
self.operation = UPGRADE
elif pkg_release > irelease:
ctx.ui.info(_("Upgrading to new distribution release"))
#try:
# if pkg_version > iversion:
# ctx.ui.info("Upgrading to new upstream version")
# self.operation = UPGRADE
#except TypeError as e:
# ctx.ui.error(f"Comparing new upstream version '{pkg_version}' to installed version '{iversion}' failed, falling back to distribution release comparison (Add '--debug' to see full traceback)")
# ctx.ui.debug(str(e))
if pkg_release > irelease:
ctx.ui.info("Upgrading to new upstream distribution release")
self.operation = UPGRADE

# is this a downgrade? confirm this action.
if not self.operation == UPGRADE:
if pkg_version < iversion:
# x = _('Downgrade to old upstream version?')
x = None
elif pkg_release < irelease:
x = _("Downgrade to old distribution release?")
#if pkg_version < iversion:
# # x = "Downgrade to old upstream version?"
# x = None
if pkg_release < irelease:
x = "Downgrade to old distribution release?"
else:
x = None
if self.ask_reinstall and x and not ctx.ui.confirm(x):
raise Error(_("Package downgrade declined"))
raise Error("Package downgrade declined")
self.operation = DOWNGRADE

# schedule for reinstall
Expand Down