Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 7 additions & 1 deletion usr/lib/linuxmint/mintUpdate/Classes.py
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ def __init__(self, package=None, source_name=None):
if package.candidate.section == "kernel" or self.package_name.startswith("linux-headers") or self.real_source_name in ["linux", "linux-kernel", "linux-signed", "linux-meta"]:
self.type = "kernel"

def add_package(self, pkg):
def add_package(self, pkg, source_pkg = None):
if self.main_package_name in SOURCE_PACKAGE_NAME_OVERRIDES:
self.display_name = self.source_name

Expand All @@ -185,6 +185,12 @@ def add_package(self, pkg):
return

if self.main_package_name != self.source_name:
# Use source package's information if exists
if (source_pkg is not None
and self.type != "kernel"
and pkg.name not in SOURCE_PACKAGE_NAME_OVERRIDES):
self.overwrite_main_package(source_pkg)
return
# Overwrite dev, dbg, common, arch packages
for suffix in ["-dev", "-dbg", "-common", "-core", "-data", "-doc", ":i386", ":amd64"]:
if (self.main_package_name.endswith(suffix) and not pkg.name.endswith(suffix)):
Expand Down
7 changes: 6 additions & 1 deletion usr/lib/linuxmint/mintUpdate/aptUpdater.py
Original file line number Diff line number Diff line change
Expand Up @@ -224,9 +224,9 @@
with open("/usr/lib/linuxmint/mintUpdate/aliases") as alias_file:
for line in alias_file:
if not line.startswith('#'):
splitted = line.split("#####")

Check failure on line 227 in usr/lib/linuxmint/mintUpdate/aptUpdater.py

View workflow job for this annotation

GitHub Actions / build / build (mint22, linuxmintd/mint22.3-amd64, Mint 22, true) / Mint 22

splitted ==> split
if len(splitted) == 4:

Check failure on line 228 in usr/lib/linuxmint/mintUpdate/aptUpdater.py

View workflow job for this annotation

GitHub Actions / build / build (mint22, linuxmintd/mint22.3-amd64, Mint 22, true) / Mint 22

splitted ==> split
(alias_packages, alias_name, alias_short_description, alias_description) = splitted

Check failure on line 229 in usr/lib/linuxmint/mintUpdate/aptUpdater.py

View workflow job for this annotation

GitHub Actions / build / build (mint22, linuxmintd/mint22.3-amd64, Mint 22, true) / Mint 22

splitted ==> split
alias_object = Alias(alias_name, alias_short_description, alias_description)
for alias_package in alias_packages.split(','):
alias_package = alias_package.strip()
Expand Down Expand Up @@ -406,7 +406,12 @@
if source_name in PRIORITY_UPDATES or not self.priority_updates_available:
if source_name in self.updates:
update = self.updates[source_name]
update.add_package(package)

source_package = None
if update.main_package_name != source_name:
source_package = self.cache.get(source_name)

update.add_package(package, source_package)
# Adjust update.old_version for kernel updates to try and
# match the kernel, not the meta
if kernel_update and package.is_installed and \
Expand Down
Loading