diff options
| author | Michael Vogt <mvo@debian.org> | 2014-05-14 18:04:48 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-05-14 18:04:48 +0200 |
| commit | e110d7bf5675f484c06b82f621ac98bedc464865 (patch) | |
| tree | 70ce5da7ad75ccbaf4b30cf4809209993ba98b23 /test/integration/test-pdiff-usage | |
| parent | 0b58b3f8917a49d83154fd3173bca36c1d617ef0 (diff) | |
| parent | 4f6d26b4d41474aa390329b7e9cb167eb70b2821 (diff) | |
Merge remote-tracking branch 'donkult/debian/experimental' into debian/experimental
Conflicts:
apt-pkg/acquire-item.cc
apt-pkg/acquire-item.h
Diffstat (limited to 'test/integration/test-pdiff-usage')
| -rwxr-xr-x | test/integration/test-pdiff-usage | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/test/integration/test-pdiff-usage b/test/integration/test-pdiff-usage index afe1ad443..74749d6ab 100755 --- a/test/integration/test-pdiff-usage +++ b/test/integration/test-pdiff-usage @@ -13,12 +13,6 @@ changetowebserver PKGFILE="${TESTDIR}/$(echo "$(basename $0)" | sed 's#^test-#Packages-#')" -echo '#!/bin/sh -touch merge-was-used -/usr/bin/diffindex-rred "$@"' > extrred -chmod +x extrred -echo 'Dir::Bin::rred "./extrred";' > rootdir/etc/apt/apt.conf.d/99rred - wasmergeused() { msgtest 'Test for successful execution of' "$*" local OUTPUT=$(mktemp) |