diff options
author | David Kalnischkies <david@kalnischkies.de> | 2014-09-09 13:52:32 +0200 |
---|---|---|
committer | David Kalnischkies <david@kalnischkies.de> | 2014-09-09 13:52:32 +0200 |
commit | 22da5c135a74eee8ed998806136e25b8ed038bd0 (patch) | |
tree | 2b142f8ad7fab6b1108070bf33b61abcbbf69d32 /test | |
parent | 223ae57d468fdcac451209a095047a07a5698212 (diff) |
don't call pager in non-terminals for changelog
Most pagers are nice and default to running non-interactively if they
aren't connected to a terminal and we relied on that. On ci.debian.net
the configured pager is printing a header out of nowhere though, so if
we are printing to a non-terminal we call "cat" instead.
In the rework we also "remove" the dependency on sensible-utils in sofar
as we call some alternatives if calling the utils fail.
This seems to be the last problem preventing a "PASS" status on
ci.debian.net, so we close the associated bugreport.
Closes: 755040
Diffstat (limited to 'test')
-rwxr-xr-x | test/integration/test-apt-get-changelog | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/test/integration/test-apt-get-changelog b/test/integration/test-apt-get-changelog index a73c3e249..4ee113482 100755 --- a/test/integration/test-apt-get-changelog +++ b/test/integration/test-apt-get-changelog @@ -28,9 +28,8 @@ testsuccess aptget changelog apt -d testfileequal 'apt.changelog' "$(cat aptarchive/pool/apt_1.0/changelog)" rm apt.changelog aptarchive/pool/apt_1.0/changelog -aptget changelog apt -qq -o APT::Changelogs::Server='http://not-on-the-main-server:8080/' > apt.changelog -testfileequal 'apt.changelog' "$(cat aptarchive/pool/apt_1.0.changelog)" -rm apt.changelog +testequal "$(cat aptarchive/pool/apt_1.0.changelog)" aptget changelog apt \ + -qq -o APT::Changelogs::Server='http://not-on-the-main-server:8080/' testsuccess aptget changelog apt -d testfileequal 'apt.changelog' "$(cat aptarchive/pool/apt_1.0.changelog)" |