diff options
| author | Michael Vogt <mvo@debian.org> | 2014-02-13 14:29:20 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-02-13 14:29:20 +0100 |
| commit | 784e35e86293094bb5c1456c8f9c844df2a71f12 (patch) | |
| tree | 28073f068ca09c46c04a5ed9e047824f782b15ac /test/integration/test-apt-get-autoremove | |
| parent | a84a4d2ab78c498d9797c07d463daec4095b37de (diff) | |
| parent | 28b4b983d95fa742a5431547285a748e8b856399 (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
configure.ac
debian/changelog
Diffstat (limited to 'test/integration/test-apt-get-autoremove')
| -rwxr-xr-x | test/integration/test-apt-get-autoremove | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/integration/test-apt-get-autoremove b/test/integration/test-apt-get-autoremove index 68ea1c574..acde4b096 100755 --- a/test/integration/test-apt-get-autoremove +++ b/test/integration/test-apt-get-autoremove @@ -42,12 +42,12 @@ testsuccess aptget autoremove -y testdpkgnotinstalled 'po-debconf' testmarkedauto -sed -i rootdir/var/log/apt/history.log -e '/^Commandline: / d' -e '/^Start-Date: / d' -e '/^End-Date: / d' -testfileequal 'rootdir/var/log/apt/history.log' ' -Install: unrelated:i386 (1), debhelper:i386 (8.0.0), po-debconf:i386 (1.0.16, automatic) - +sed rootdir/var/log/apt/history.log -e '/^Commandline: / d' -e '/^Start-Date: / d' -e '/^End-Date: / d' -e 's#), #)\nInstall: #g' | sort -u > apt-history.log +testfileequal 'apt-history.log' ' +Install: debhelper:i386 (8.0.0) +Install: po-debconf:i386 (1.0.16, automatic) +Install: unrelated:i386 (1) Remove: debhelper:i386 (8.0.0) - Remove: po-debconf:i386 (1.0.16)' testsuccess aptget install debhelper -y |