diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-14 19:18:39 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-14 19:18:39 +0000 |
commit | 55158daa5b13e2f61658a1678288e5848bd2927a (patch) | |
tree | 551ec3d16791c4f72e6b7b403094459e7466a548 /test/integration/test-bug-611729-mark-as-manual | |
parent | Releasing progress-linux version 2.9.2-0.0~progress7.99u1. (diff) | |
download | apt-55158daa5b13e2f61658a1678288e5848bd2927a.tar.xz apt-55158daa5b13e2f61658a1678288e5848bd2927a.zip |
Merging upstream version 2.9.3.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'test/integration/test-bug-611729-mark-as-manual')
-rwxr-xr-x | test/integration/test-bug-611729-mark-as-manual | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/test/integration/test-bug-611729-mark-as-manual b/test/integration/test-bug-611729-mark-as-manual index 63f8245..bd9af32 100755 --- a/test/integration/test-bug-611729-mark-as-manual +++ b/test/integration/test-bug-611729-mark-as-manual @@ -56,14 +56,8 @@ testdpkginstalled b c testmarkedauto 'b' sed -i rootdir/var/log/apt/history.log -e '/^Commandline: / d' -e '/^Start-Date: / d' -e '/^End-Date: / d' -if [ -n "$SUDO_USER" ] && [ "$(id -u "$SUDO_USER")" -gt 0 ]; then - testfileequal 'rootdir/var/log/apt/history.log' " -Requested-By: $SUDO_USER ($(id -u "$SUDO_USER")) -Reinstall: b:i386 (1.0)" -else - testfileequal 'rootdir/var/log/apt/history.log' ' +testfileequal 'rootdir/var/log/apt/history.log' ' Reinstall: b:i386 (1.0)' -fi testsuccessequal 'Reading package lists... Building dependency tree... |