diff options
| author | Michael Vogt <mvo@debian.org> | 2014-01-26 08:15:29 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-01-26 08:15:29 +0100 |
| commit | 796673c38509300c988fbba2f2679ba3c76916db (patch) | |
| tree | 403055b486d0a1d65561528582d4b0bdc66e53a0 /test/integration/test-ubuntu-bug-784473-InRelease-one-message-only | |
| parent | 9aef3908c892f9d9349d8bf8a5ceaeea313ba0fe (diff) | |
| parent | 2f958de6e883ba7b0c9895750d4dde35047f1e82 (diff) | |
Merge remote-tracking branch 'donkult/debian/sid' into debian/sid
Conflicts:
apt-private/private-list.cc
doc/po/de.po
test/integration/framework
Diffstat (limited to 'test/integration/test-ubuntu-bug-784473-InRelease-one-message-only')
| -rwxr-xr-x | test/integration/test-ubuntu-bug-784473-InRelease-one-message-only | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/integration/test-ubuntu-bug-784473-InRelease-one-message-only b/test/integration/test-ubuntu-bug-784473-InRelease-one-message-only index e9d684309..50ca2bf57 100755 --- a/test/integration/test-ubuntu-bug-784473-InRelease-one-message-only +++ b/test/integration/test-ubuntu-bug-784473-InRelease-one-message-only @@ -35,5 +35,5 @@ testequal "Package files: 100 ${ROOTDIR}/rootdir/var/lib/dpkg/status release a=now 500 file:${ROOTDIR}/aptarchive/ unstable/main i386 Packages - release a=unstable,n=unstable,c=main + release a=unstable,n=sid,c=main Pinned packages:" aptcache policy |