diff options
author | David Kalnischkies <david@kalnischkies.de> | 2014-09-27 00:12:44 +0200 |
---|---|---|
committer | David Kalnischkies <david@kalnischkies.de> | 2014-09-27 00:12:44 +0200 |
commit | c0f3bde3e0cf33b9134fae8289aa651f7f1866b1 (patch) | |
tree | cab5ce7d8beadca310a2e5e2a2c18f28a0ef55e0 /test/integration/test-apt-cdrom | |
parent | bf3ad91fdf4967fe107e08a6887f9ed51f4f5eea (diff) | |
parent | 98f0d7b3d9d7ed0a5cf11d8f9327a021954816b6 (diff) |
Merge branch 'feature/gnupglimit' into debian/experimental
Diffstat (limited to 'test/integration/test-apt-cdrom')
-rwxr-xr-x | test/integration/test-apt-cdrom | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/integration/test-apt-cdrom b/test/integration/test-apt-cdrom index 8d8fdf167..9fbc4288d 100755 --- a/test/integration/test-apt-cdrom +++ b/test/integration/test-apt-cdrom @@ -29,7 +29,7 @@ aptcdromlog() { test ! -e rootdir/media/cdrom || echo "CD-ROM is mounted, but shouldn't be!" test -e rootdir/media/cdrom-unmounted || echo "Unmounted CD-ROM doesn't exist, but it should!" aptcdrom "$@" -o quiet=1 >rootdir/tmp/apt-cdrom.log 2>&1 </dev/null - sed -e '/gpgv/ d' -e '/^Identifying/ d' -e '/Reading / d' rootdir/tmp/apt-cdrom.log + sed -e '/gpgv\?: Signature made/ d' -e '/gpgv\?: Good signature/ d' -e '/^Identifying/ d' -e '/Reading / d' rootdir/tmp/apt-cdrom.log test ! -e rootdir/media/cdrom || echo "CD-ROM is mounted, but shouldn't be!" test -e rootdir/media/cdrom-unmounted || echo "Unmounted CD-ROM doesn't exist, but it should!" } |