diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2011-05-17 20:20:46 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2011-05-17 20:20:46 +0200 |
| commit | d953d210bb54accb416f2144104b79dcd29198ba (patch) | |
| tree | 123e5ff5759f1ef24311aa5163a925aa3681e5f9 /test/integration | |
| parent | a16dec4dbe7847597025f44f84027bb3f25f4f42 (diff) | |
* cmdline/apt-get.cc:
- do not discard the error messages from the resolver and instead
only show the general 'Broken packages' message if nothing else
Diffstat (limited to 'test/integration')
| -rwxr-xr-x | test/integration/test-handling-broken-orgroups | 4 | ||||
| -rwxr-xr-x | test/integration/test-release-candidate-switching | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/integration/test-handling-broken-orgroups b/test/integration/test-handling-broken-orgroups index d88ad0000..20b314074 100755 --- a/test/integration/test-handling-broken-orgroups +++ b/test/integration/test-handling-broken-orgroups @@ -58,7 +58,7 @@ The following information may help to resolve the situation: The following packages have unmet dependencies: coolstuff-broken : Depends: cool2 but it is not installable or stuff2 but it is not installable -E: Broken packages' aptget install coolstuff-broken -s +E: Unable to correct problems, you have held broken packages.' aptget install coolstuff-broken -s testequal 'Reading package lists... Building dependency tree... @@ -105,4 +105,4 @@ The following information may help to resolve the situation: The following packages have unmet dependencies: coolstuff-provided-broken : Depends: cool2 but it is not installable or stuff-abi-2 -E: Broken packages' aptget install coolstuff-provided-broken -s +E: Unable to correct problems, you have held broken packages.' aptget install coolstuff-provided-broken -s diff --git a/test/integration/test-release-candidate-switching b/test/integration/test-release-candidate-switching index b6dbe99db..0970cb935 100755 --- a/test/integration/test-release-candidate-switching +++ b/test/integration/test-release-candidate-switching @@ -416,4 +416,4 @@ The following information may help to resolve the situation: The following packages have unmet dependencies: uninstallablepkg : Depends: libmtp8 (>= 10:0.20.1) but it is not going to be installed Depends: amarok-utils (= 2.3.2-2+exp) but 2.3.1-1+sid is to be installed -E: Broken packages" aptget install uninstallablepkg/experimental --trivial-only -V -q=0 +E: Unable to correct problems, you have held broken packages." aptget install uninstallablepkg/experimental --trivial-only -V -q=0 |