Ubuntu
ubuntu-drivers-common package

Merge ~mitchellaugustin/ubuntu/+source/ubuntu-drivers-common:noble-resolver-fix into ubuntu/+source/ubuntu-drivers-common:ubuntu/noble-devel

  1. Git
  2. lp:~mitchellaugustin/ubuntu/+source/ubuntu-drivers-common
  3. noble-resolver-fix
  4. Merge into ubuntu/noble-devel
Proposed by Mitchell Augustin
Status: Merged
Merged at revision: d428aa692c25c819b1f74f83381175d9e54a30be
Proposed branch: ~mitchellaugustin/ubuntu/+source/ubuntu-drivers-common:noble-resolver-fix
Merge into: ubuntu/+source/ubuntu-drivers-common:ubuntu/noble-devel
Diff against target: 47 lines (+17/-0)
3 files modified
UbuntuDrivers/detect.py (+6/-0)
debian/changelog (+6/-0)
ubuntu-drivers (+5/-0)
Reviewer Review Type Date Requested Status
Nick Rosbrook (community) Approve
git-ubuntu import Pending
Review via email: mp+493827@code.launchpad.net

Commit message

Prevent attempts to coinstall conflicting nvidia-driver-* packages (LP: #2125156)

Description of the change

Prevent attempts to coinstall conflicting nvidia-driver-* packages (LP: #2125156)

To post a comment you must log in.
Revision history for this message
Nick Rosbrook (enr0n) wrote :

LGTM and sponsored.

review: Approve
Revision history for this message
Mitchell Augustin (mitchellaugustin) wrote :

Thanks!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/UbuntuDrivers/detect.py b/UbuntuDrivers/detect.py
2index 09e40d4..dee455e 100644
3--- a/UbuntuDrivers/detect.py
4+++ b/UbuntuDrivers/detect.py
5@@ -1036,6 +1036,12 @@ def get_desktop_package_list(
6
7 candidate = depcache.get_candidate_ver(package_obj)
8 records.lookup(candidate.file_list[0])
9+
10+ # Do not add more than one nvidia-driver-* (or associated packages) to to_install
11+ if p.startswith("nvidia-driver-"):
12+ if any(pkg.startswith("nvidia-driver-") for pkg in to_install):
13+ continue
14+
15 to_install.append(p)
16
17 # See if runtimepm is supported
18diff --git a/debian/changelog b/debian/changelog
19index 56b2abc..bf19593 100644
20--- a/debian/changelog
21+++ b/debian/changelog
22@@ -1,3 +1,9 @@
23+ubuntu-drivers-common (1:0.9.7.6ubuntu3.5) noble; urgency=medium
24+
25+ * Prevent coinstallation of conflicting Nvidia Drivers (LP: #2125156)
26+
27+ -- Mitchell Augustin <mitchell.augustin@canonical.com> Fri, 03 Oct 2025 16:26:02 -0500
28+
29 ubuntu-drivers-common (1:0.9.7.6ubuntu3.4) noble; urgency=medium
30
31 * Remove outdated dependency to fix ADT failures (LP: #2071829)
32diff --git a/ubuntu-drivers b/ubuntu-drivers
33index 726b3b8..633c94e 100755
34--- a/ubuntu-drivers
35+++ b/ubuntu-drivers
36@@ -271,6 +271,11 @@ def install_gpgpu(args):
37 key=cmp_to_key(lambda left, right:
38 UbuntuDrivers.detect._cmp_gfx_alternatives_gpgpu(left[0], right[0])),
39 reverse=True):
40+ # Do not add more than one nvidia-driver-* (or associated packages) to to_install
41+ if p.startswith("nvidia-driver-"):
42+ if any(pkg.startswith("nvidia-driver-") for pkg in to_install):
43+ continue
44+
45 candidate = packages[p].get('metapackage')
46 if candidate and not cache[candidate].current_ver:
47 to_install.append(p)

Subscribers

People subscribed via source and target branches