diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-05-31 10:34:56 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-05-31 10:34:56 +0200 |
| commit | 3b310a644d82abeb76b5028a9ee7b8d1b96fc629 (patch) | |
| tree | 4f700ae465eb6c065dfba405741c1ab800e06f11 /test/integration/test-bug-612557-garbage-upgrade | |
| parent | c996a75cabffa5d3e5bc610d9f1097c2edae606f (diff) | |
| parent | 4fdb612374655361c8923a4611db6a0d10054317 (diff) | |
merged from the debian branch
Diffstat (limited to 'test/integration/test-bug-612557-garbage-upgrade')
| -rwxr-xr-x | test/integration/test-bug-612557-garbage-upgrade | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/integration/test-bug-612557-garbage-upgrade b/test/integration/test-bug-612557-garbage-upgrade index 3112e618c..8efd1687a 100755 --- a/test/integration/test-bug-612557-garbage-upgrade +++ b/test/integration/test-bug-612557-garbage-upgrade @@ -13,9 +13,9 @@ insertpackage 'unstable' 'libreoffice-common' 'all' '1:3.3.0-2' 'Conflicts: open setupaptarchive touch rootdir/var/lib/apt/extended_states -aptmark markauto python-uno ure uno-libs3 openoffice.org-common openoffice.org-style-galaxy +aptmark markauto python-uno openoffice.org-common #aptmark unmarkauto openoffice.org-emailmerge -testmarkedauto python-uno ure uno-libs3 openoffice.org-common openoffice.org-style-galaxy +testmarkedauto python-uno openoffice.org-common testequal 'Reading package lists... Building dependency tree... @@ -33,7 +33,7 @@ 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 -testmarkedauto python-uno ure uno-libs3 openoffice.org-common openoffice.org-style-galaxy openoffice.org-emailmerge +testmarkedauto python-uno openoffice.org-common openoffice.org-emailmerge testequal 'Reading package lists... Building dependency tree... |