diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-09-23 15:47:44 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-09-23 15:47:44 +0200 |
| commit | db1d1c32149177c0b6ca49e5107ab1f5fd364660 (patch) | |
| tree | b06b22a9c92455b32889c88407f4190113a5cdd9 /test/integration/test-apt-get-changelog | |
| parent | 916b89109cd77728004819d4705778e3dc489b2e (diff) | |
| parent | c511c5e8ed3f59ddee1b174b39e5cc16a2f11922 (diff) | |
Merge remote-tracking branch 'upstream/debian/experimental' into feature/acq-trans
Conflicts:
apt-pkg/acquire-item.cc
apt-pkg/acquire-item.h
methods/copy.cc
test/integration/test-hashsum-verification
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)" |