From cfc11b2e1d8480727208b9d3e9577172de9a4038 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 29 Dec 2016 12:55:12 +0100 Subject: expand -f to --fix-broken in error messages Users end up believing that this is a --force mode as -f is common for that, but apt doesn't have such a mode and --fix-broken is really not about forcing something but actually trying to fix the breakage which tends to be the result of a user forcing something on its system via low-level forced dpkg calls. Example: The "common" pattern of "dpkg -i ./foo.deb; apt install -f" is nowadays far better dealt with via "apt install ./foo.deb". And while at it the two places handing out this suggestion are changed to use the same strings to avoid needless translation work in the future and the suggestion uses 'apt' instead of 'apt-get' as this will be run interactively by a user, so its a good opportunity to showcase what we can do and will allow us to be more helpful to the user. Closes: #709092 Thanks: Kristian Glass for initial patch! --- test/integration/test-bug-686346-package-missing-architecture | 8 ++++---- test/integration/test-parse-all-archs-into-cache | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'test') diff --git a/test/integration/test-bug-686346-package-missing-architecture b/test/integration/test-bug-686346-package-missing-architecture index 8f9536a09..d28600a4f 100755 --- a/test/integration/test-bug-686346-package-missing-architecture +++ b/test/integration/test-bug-686346-package-missing-architecture @@ -69,7 +69,7 @@ insertinstalledpackage 'pkgb' 'amd64' '2' testequalor2 "Reading package lists... Building dependency tree... Reading state information... -You might want to run 'apt-get -f install' to correct these. +You might want to run 'apt --fix-broken install' to correct these. The following packages have unmet dependencies: pkgb : Conflicts: pkgb:none but 1 is installed pkgb:none : Conflicts: pkgb but 2 is installed @@ -77,10 +77,10 @@ The following packages have unmet dependencies: Conflicts: pkgb but 2 is installed pkgg : Conflicts: pkgb but 2 is installed Conflicts: pkgb:none but 1 is installed -E: Unmet dependencies. Try using -f." "Reading package lists... +E: Unmet dependencies. Try using --fix-broken." "Reading package lists... Building dependency tree... Reading state information... -You might want to run 'apt-get -f install' to correct these. +You might want to run 'apt --fix-broken install' to correct these. The following packages have unmet dependencies: pkgb : Conflicts: pkgb:none but 1 is installed pkgb:none : Conflicts: pkgb but 2 is installed @@ -88,7 +88,7 @@ The following packages have unmet dependencies: Conflicts: pkgb:none but 1 is installed pkgg : Conflicts: pkgb but 2 is installed Conflicts: pkgb:none but 1 is installed -E: Unmet dependencies. Try using -f." aptget check +E: Unmet dependencies. Try 'apt --fix-broken install' with no packages (or specify a solution)." aptget check # check that dependencies are generated for none-packages rm rootdir/var/lib/dpkg/status diff --git a/test/integration/test-parse-all-archs-into-cache b/test/integration/test-parse-all-archs-into-cache index 65222f0fe..7485431db 100755 --- a/test/integration/test-parse-all-archs-into-cache +++ b/test/integration/test-parse-all-archs-into-cache @@ -22,10 +22,10 @@ setupaptarchive testfailureequal "Reading package lists... Building dependency tree... -You might want to run 'apt-get -f install' to correct these. +You might want to run 'apt --fix-broken install' to correct these. The following packages have unmet dependencies: foo:amd64 : Depends: libfoo1:amd64 but it is not installable -E: Unmet dependencies. Try using -f." aptget check -s +E: Unmet dependencies. Try 'apt --fix-broken install' with no packages (or specify a solution)." aptget check -s insertinstalledpackage 'libfoo1' 'amd64' '1' 'Multi-Arch: same' -- cgit v1.2.3