diff options
author | Christian PERRIER <bubulle@debian.org> | 2013-08-17 07:58:13 +0200 |
---|---|---|
committer | Christian PERRIER <bubulle@debian.org> | 2013-08-17 07:58:13 +0200 |
commit | 010364b7b52af9f6f4d8cbb6391a721260b6ffb5 (patch) | |
tree | 3ea2ba749956270d53f4705a1358af01b3b060fe /test/integration/test-bug-612557-garbage-upgrade | |
parent | 34b769c51ac7cf747fb9dc5b8a5697c1c292360b (diff) | |
parent | 488011fa99aee25bedb39ae2cc3115ad1ab000c0 (diff) |
Merge branch 'debian/sid' of git://git.debian.org/git/apt/apt into debian/sid
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 8efd1687a..910b3b149 100755 --- a/test/integration/test-bug-612557-garbage-upgrade +++ b/test/integration/test-bug-612557-garbage-upgrade @@ -13,7 +13,7 @@ insertpackage 'unstable' 'libreoffice-common' 'all' '1:3.3.0-2' 'Conflicts: open setupaptarchive touch rootdir/var/lib/apt/extended_states -aptmark markauto python-uno openoffice.org-common +testsuccess aptmark markauto python-uno openoffice.org-common #aptmark unmarkauto openoffice.org-emailmerge testmarkedauto python-uno openoffice.org-common @@ -32,7 +32,7 @@ The following packages will be upgraded: 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 -aptmark markauto openoffice.org-emailmerge +testsuccess aptmark markauto openoffice.org-emailmerge testmarkedauto python-uno openoffice.org-common openoffice.org-emailmerge testequal 'Reading package lists... |