diff options
| author | Michael Vogt <mvo@debian.org> | 2014-02-27 22:52:34 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-02-27 22:52:34 +0100 |
| commit | fce69e7a0f38299c57ef96ae1c1dd9a5379bfd5a (patch) | |
| tree | be7d18baa836e9df166ec63f6c9fe6f94bb84b40 /test/integration/test-bug-633350-do-not-kill-last-char-in-Release | |
| parent | a5e790985752c6820e08e7a7e650e1607fa826e4 (diff) | |
| parent | fc104da6a583736223b2f941e43a05ea26b63a7d (diff) | |
Merge branch 'debian/sid' into debian/experimental
Conflicts:
apt-private/private-list.cc
configure.ac
debian/apt.install.in
debian/changelog
Diffstat (limited to 'test/integration/test-bug-633350-do-not-kill-last-char-in-Release')
| -rwxr-xr-x | test/integration/test-bug-633350-do-not-kill-last-char-in-Release | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/integration/test-bug-633350-do-not-kill-last-char-in-Release b/test/integration/test-bug-633350-do-not-kill-last-char-in-Release index 2aae7cfcc..988f8c9d0 100755 --- a/test/integration/test-bug-633350-do-not-kill-last-char-in-Release +++ b/test/integration/test-bug-633350-do-not-kill-last-char-in-Release @@ -8,7 +8,7 @@ configarchitecture 'amd64' insertpackage 'unstable' 'cool' 'amd64' '1.0' -setupaptarchive 2> /dev/null +setupaptarchive --no-update echo 'NotAutomatic: yes' >> aptarchive/dists/unstable/Release |