summaryrefslogtreecommitdiff
path: root/test/integration/framework
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2011-02-07 11:32:55 +0100
committerDavid Kalnischkies <kalnischkies@gmail.com>2011-02-07 11:32:55 +0100
commit6a910c9db4d450241a57f61b2d3d3e302bb9c11c (patch)
treee58a9420d269e08c011abfa4f34e0c42aeeefc78 /test/integration/framework
parentfbd64f76a595b61d2aaa9c0615903d9b68786930 (diff)
allow conflicts in the same group again (Closes: #612099)
Diffstat (limited to 'test/integration/framework')
-rw-r--r--test/integration/framework2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/integration/framework b/test/integration/framework
index 3aa80db23..d91599f1b 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -267,7 +267,7 @@ Package: $NAME" > ${BUILDDIR}/debian/control
(cd ${BUILDDIR}; dpkg-gencontrol -DArchitecture=$ARCH)
(cd ${BUILDDIR}/debian/tmp; md5sum $(find usr/ -type f) > DEBIAN/md5sums)
- dpkg-deb --build ${BUILDDIR}/debian/tmp ${BUILDDIR}/.. > /dev/null
+ dpkg-deb --build ${BUILDDIR}/debian/tmp ${BUILDDIR}/.. 2> /dev/null > /dev/null
echo "pool/${NAME}_${VERSION}_${ARCH}.deb" >> ${BUILDDIR}/../${RELEASE}.${DISTSECTION}.pkglist
for SRC in $SRCS; do
echo "pool/${SRC}" >> ${BUILDDIR}/../${RELEASE}.${DISTSECTION}.srclist