diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-09-23 14:20:27 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-09-23 14:20:27 +0200 |
| commit | c511c5e8ed3f59ddee1b174b39e5cc16a2f11922 (patch) | |
| tree | 732e4b2ff090c01bb07dedeefe25cd517070c256 /test/integration/test-apt-get-changelog | |
| parent | 8c782efd93342c6119e8ba2ff6989b7a164b7f3d (diff) | |
| parent | d916e2a93b798e29d342e9498266767c5be8e2a5 (diff) | |
Merge branch 'debian/sid' into debian/experimental
Conflicts:
apt-pkg/acquire-item.cc
apt-pkg/acquire-item.h
apt-pkg/cachefilter.h
configure.ac
debian/changelog
Diffstat (limited to 'test/integration/test-apt-get-changelog')
| -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)" |