diff options
Diffstat (limited to 'test/integration/test-bug-612557-garbage-upgrade')
| -rwxr-xr-x | test/integration/test-bug-612557-garbage-upgrade | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/integration/test-bug-612557-garbage-upgrade b/test/integration/test-bug-612557-garbage-upgrade index 00bc9ac2d..ced55a5bf 100755 --- a/test/integration/test-bug-612557-garbage-upgrade +++ b/test/integration/test-bug-612557-garbage-upgrade @@ -26,7 +26,7 @@ testfailuremsg "E: Unable to satisfy dependencies. Reached two conflicting decis 2. openoffice.org-common:i386=1:3.2.1-11+squeeze2 is selected for install because: 1. openoffice.org-emailmerge:i386 is selected for install 2. openoffice.org-emailmerge:i386 PreDepends openoffice.org-common - 3. openoffice.org-common:i386 is available in version 1:3.2.1-11+squeeze2" aptget --trivial-only install python-uno --solver 3.0 + 3. openoffice.org-common:i386 is available in version 1:3.2.1-11+squeeze2" aptget --trivial-only install python-uno --solver 3.0 -o APT::Solver::RemoveManual=false testfailureequal 'Reading package lists... Building dependency tree... Reading state information... @@ -41,7 +41,7 @@ The following packages will be upgraded: 1 upgraded, 1 newly installed, 2 to remove and 0 not upgraded. Need to get 0 B/84 B of archives. After this operation, 53.2 MB disk space will be freed. -E: Trivial Only specified but this is not a trivial operation.' aptget --trivial-only install python-uno --solver internal +E: Trivial Only specified but this is not a trivial operation.' aptget --trivial-only install python-uno testsuccess aptmark markauto openoffice.org-emailmerge testmarkedauto python-uno openoffice.org-common openoffice.org-emailmerge |