From b1c3039dae19553bff19615fbb4d116aeaa644a7 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 16 May 2024 13:41:48 +0000 Subject: Do not mark new if we have already installed providers The test is actually documenting another bug hidden a bit by this one as we do not need to install a NEW package in this situation as the upgrade needing it was kept back, but it was protected from considering it to be autoremoveable as all providers tend to be considered protected, but by limiting us to installed providers if we have some we can drag those new packages out of hiding. Now, we "just" have to get right of the NEW package in a next step. --- test/integration/test-bug-604222-new-and-autoremove | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'test') diff --git a/test/integration/test-bug-604222-new-and-autoremove b/test/integration/test-bug-604222-new-and-autoremove index 78a288214..92219fc07 100755 --- a/test/integration/test-bug-604222-new-and-autoremove +++ b/test/integration/test-bug-604222-new-and-autoremove @@ -18,19 +18,30 @@ insertpackage 'stable' 'libkf5kipi-data' 'i386' '4:16.08.0-1' 'Breaks: libkipi-d insertpackage 'stable' 'libkipi-data' 'i386' '4:15.08.0-1' '' 'important' insertpackage 'stable' 'libgphoto2-l10n' 'all' '2' -insertpackage 'installed,stable' 'photoapp1' 'all' '1' 'Recommends: libgphoto2-l10n (= 1)' +insertinstalledpackage 'libfoto1' 'i386' '1' +insertpackage 'installed,stable' 'photoapp1' 'all' '1' 'Depends: libfoto1 +Recommends: libgphoto2-l10n (= 1)' insertinstalledpackage 'photoapp2' 'all' '1' +insertpackage 'stable' 'libfoto1t64' 'i386' '1' 'Provides: libfoto1' insertpackage 'stable' 'photoapp2' 'all' '2' 'Conflicts: photoapp1 +Depends: libfoto1t64 Recommends: libgphoto2-l10n (= 2)' setupaptarchive -testsuccessequal 'Reading package lists... +testsuccessequal "Reading package lists... Building dependency tree... Calculating upgrade... +The following package was automatically installed and is no longer required: + libfoto1t64 +Use 'apt autoremove' to remove it. +The following NEW packages will be installed: + libfoto1t64 The following packages have been kept back: photoapp2 -0 upgraded, 0 newly installed, 0 to remove and 1 not upgraded.' apt upgrade -s +0 upgraded, 1 newly installed, 0 to remove and 1 not upgraded. +Inst libfoto1t64 (1 stable [i386]) +Conf libfoto1t64 (1 stable [i386])" apt upgrade -s insertinstalledpackage 'libvtk5.4' 'i386' '5.4.2-7' testsuccess aptmark markauto 'libvtk5.4' -- cgit v1.2.3-70-g09d2