From d622baeea4828b4bf62d939b7a4a7cd4051f78a5 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 28 Apr 2016 15:03:55 +0200 Subject: show StateCache flags in Pkg debug prettyprint This basically introduces ~33 flags in the output, but a package can have only ~11 of them displayed at the same time. There is quiet a bit of duplication also (an uninstalled package is by definition a newinstall if its getting installed), but as this is debug output we are better of showing them all in case one of them isn't set in a way it is supposed to be set. Git-Dch: Ignore --- .../test-bug-549968-install-depends-of-not-installed | 4 ++-- test/integration/test-bug-604222-new-and-autoremove | 14 +++++++------- .../test-bug-618848-always-respect-user-requests | 18 +++++++++--------- 3 files changed, 18 insertions(+), 18 deletions(-) (limited to 'test/integration') diff --git a/test/integration/test-bug-549968-install-depends-of-not-installed b/test/integration/test-bug-549968-install-depends-of-not-installed index a189f9c93..fab67c4e9 100755 --- a/test/integration/test-bug-549968-install-depends-of-not-installed +++ b/test/integration/test-bug-549968-install-depends-of-not-installed @@ -16,8 +16,8 @@ setupaptarchive # prevent it, but to late - its better to fail earlier testsuccessequal "Reading package lists... Building dependency tree... - MarkInstall coolstuff [ i386 ] < none -> 1.0 > ( other ) FU=1 - Ignore MarkInstall of extracoolstuff [ i386 ] < none -> 1.0 > ( other ) as its mode (Keep) is protected + MarkInstall coolstuff:i386 < none -> 1.0 @un puN IPb > FU=1 + Ignore MarkInstall of extracoolstuff:i386 < none | 1.0 @hn puH > as its mode (Keep) is protected Package 'extracoolstuff' is not installed, so not removed Recommended packages: extracoolstuff diff --git a/test/integration/test-bug-604222-new-and-autoremove b/test/integration/test-bug-604222-new-and-autoremove index 48d79ea77..b6bb9ddea 100755 --- a/test/integration/test-bug-604222-new-and-autoremove +++ b/test/integration/test-bug-604222-new-and-autoremove @@ -76,13 +76,13 @@ rm rootdir/var/lib/apt/extended_states CONFLICTING='Reading package lists... Building dependency tree... - MarkInstall dummy-archive [ i386 ] < none -> 0.invalid.0 > ( admin ) FU=1 - MarkInstall libavcodec52 [ i386 ] < none -> 4:0.5.2-6 > ( libs ) FU=0 - MarkInstall libvtk5-dev [ i386 ] < none -> 5.4.2-8 > ( libdevel ) FU=0 - MarkInstall libvtk5.4 [ i386 ] < none -> 5.4.2-8 > ( libs ) FU=0 - MarkKeep libvtk5-dev [ i386 ] < none -> 5.4.2-8 > ( libdevel ) FU=0 - MarkKeep libvtk5-dev [ i386 ] < none -> 5.4.2-8 > ( libdevel ) FU=0 - MarkDelete libvtk5.4 [ i386 ] < none -> 5.4.2-8 > ( libs ) FU=0 + MarkInstall dummy-archive:i386 < none -> 0.invalid.0 @un puN Ib > FU=1 + MarkInstall libavcodec52:i386 < none -> 4:0.5.2-6 @un uN > FU=0 + MarkInstall libvtk5-dev:i386 < none -> 5.4.2-8 @un uN Ib > FU=0 + MarkInstall libvtk5.4:i386 < none -> 5.4.2-8 @un uN > FU=0 + MarkKeep libvtk5-dev:i386 < none -> 5.4.2-8 @un uN > FU=0 + MarkKeep libvtk5-dev:i386 < none -> 5.4.2-8 @un uN > FU=0 + MarkDelete libvtk5.4:i386 < none -> 5.4.2-8 @un ugN > FU=0 The following additional packages will be installed: libavcodec52 libopenal-dev The following NEW packages will be installed: diff --git a/test/integration/test-bug-618848-always-respect-user-requests b/test/integration/test-bug-618848-always-respect-user-requests index 7d2b35f9e..fa190a93d 100755 --- a/test/integration/test-bug-618848-always-respect-user-requests +++ b/test/integration/test-bug-618848-always-respect-user-requests @@ -15,18 +15,18 @@ setupaptarchive testsuccessequal 'Reading package lists... Building dependency tree... - MarkDelete libdb4.8 [ i386 ] < 1.0 > ( other ) FU=1 - MarkDelete exim4-daemon-light [ i386 ] < 1.0 > ( other ) FU=0 - MarkInstall exim4-daemon-heavy [ i386 ] < none -> 1.0 > ( other ) FU=0 - Ignore MarkInstall of libdb4.8 [ i386 ] < 1.0 > ( other ) as its mode (Delete) is protected - MarkDelete exim4-daemon-heavy [ i386 ] < none -> 1.0 > ( other ) FU=0 - MarkDelete exim4 [ i386 ] < 1.0 > ( other ) FU=0 + MarkDelete libdb4.8:i386 < 1.0 @ii pmK > FU=1 + MarkDelete exim4-daemon-light:i386 < 1.0 @ii mK Ib > FU=0 + MarkInstall exim4-daemon-heavy:i386 < none -> 1.0 @un uN Ib > FU=0 + Ignore MarkInstall of libdb4.8:i386 < 1.0 @ii pmR > as its mode (Delete) is protected + MarkDelete exim4-daemon-heavy:i386 < none -> 1.0 @un uN Ib > FU=0 + MarkDelete exim4:i386 < 1.0 @ii mK Ib > FU=0 The following packages will be REMOVED: exim4 exim4-daemon-light libdb4.8 - MarkDelete exim4 [ i386 ] < 1.0 > ( other ) FU=1 + MarkDelete exim4:i386 < 1.0 @ii K > FU=1 0 upgraded, 0 newly installed, 3 to remove and 0 not upgraded. Remv exim4 [1.0] - MarkDelete exim4-daemon-light [ i386 ] < 1.0 > ( other ) FU=1 + MarkDelete exim4-daemon-light:i386 < 1.0 @ii K > FU=1 Remv exim4-daemon-light [1.0] - MarkDelete libdb4.8 [ i386 ] < 1.0 > ( other ) FU=1 + MarkDelete libdb4.8:i386 < 1.0 @ii K > FU=1 Remv libdb4.8 [1.0]' aptget remove libdb4.8 -s -o Debug::pkgDepCache::Marker=1 -- cgit v1.2.3