This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=c8db4e9df803117b7e598330183c981bc595e3fc commit c8db4e9df803117b7e598330183c981bc595e3fc Author: Guillem Jover <[email protected]> AuthorDate: Sat Sep 15 19:07:55 2012 +0200 t-conflict-provide-replace-virtual-multiarch: New test case Bug-Debian: http://bugs.debian.org/683411 --- Makefile | 1 + .../Makefile | 23 ++++++++++++++++++++++ .../pkg-real-amd64/DEBIAN/control | 10 +++++----- .../pkg-real-i386/DEBIAN/control | 10 +++++----- .../pkg-virt-amd64}/DEBIAN/control | 5 +++-- .../pkg-virt-i386}/DEBIAN/control | 5 +++-- 6 files changed, 40 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 51a61471d..ffa07c832 100644 --- a/Makefile +++ b/Makefile @@ -45,6 +45,7 @@ TESTS_PASS += t-disappear-empty TESTS_PASS += t-conflict TESTS_PASS += t-conflict-provide-replace-real TESTS_PASS += t-conflict-provide-replace-virtual +TESTS_PASS += t-conflict-provide-replace-virtual-multiarch TESTS_PASS += t-conflict-provide-replace-interface TESTS_PASS += t-predepends-no-triggers TESTS_PASS += t-triggers diff --git a/t-conflict-provide-replace-virtual-multiarch/Makefile b/t-conflict-provide-replace-virtual-multiarch/Makefile new file mode 100644 index 000000000..22176a339 --- /dev/null +++ b/t-conflict-provide-replace-virtual-multiarch/Makefile @@ -0,0 +1,23 @@ +TESTS_DEB := pkg-virt-i386 pkg-virt-amd64 pkg-real-i386 pkg-real-amd64 + +include ../Test.mk + +test-case: + $(DPKG) --add-architecture amd64 + $(DPKG) --add-architecture i386 + $(DPKG_INSTALL) pkg-virt-i386.deb + # Configuring pkg-real:amd64 should not be allowed + ! $(DPKG_INSTALL) pkg-real-amd64.deb + $(DPKG_INSTALL) pkg-real-i386.deb + $(DPKG_INSTALL) pkg-virt-amd64.deb + $(DPKG_INSTALL) pkg-real-i386.deb + # Purging should not be allowed + ! $(DPKG_PURGE) pkg-virt:i386 + +test-clean: + $(DPKG_PURGE) pkg-real:i386 + $(DPKG_PURGE) pkg-real:amd64 + $(DPKG_PURGE) pkg-virt:i386 + $(DPKG_PURGE) pkg-virt:amd64 + $(DPKG) --remove-architecture amd64 + $(DPKG) --remove-architecture i386 diff --git a/t-db/db-cross-multi-update/status b/t-conflict-provide-replace-virtual-multiarch/pkg-real-amd64/DEBIAN/control similarity index 57% copy from t-db/db-cross-multi-update/status copy to t-conflict-provide-replace-virtual-multiarch/pkg-real-amd64/DEBIAN/control index cfa1c04f3..b0d033cc2 100644 --- a/t-db/db-cross-multi-update/status +++ b/t-conflict-provide-replace-virtual-multiarch/pkg-real-amd64/DEBIAN/control @@ -1,10 +1,10 @@ -Package: pkg-multi -Status: install ok config-files -Priority: extra +Package: pkg-real +Version: 0 Section: test +Priority: extra Maintainer: Dpkg Developers <[email protected]> Architecture: amd64 Multi-Arch: same -Version: 1.0 -Description: test package +Depends: pkg-v +Description: test package - depending on virtual diff --git a/t-db/db-bogus-multi-update/updates/0001 b/t-conflict-provide-replace-virtual-multiarch/pkg-real-i386/DEBIAN/control similarity index 57% copy from t-db/db-bogus-multi-update/updates/0001 copy to t-conflict-provide-replace-virtual-multiarch/pkg-real-i386/DEBIAN/control index 4c00629ad..e248c73e9 100644 --- a/t-db/db-bogus-multi-update/updates/0001 +++ b/t-conflict-provide-replace-virtual-multiarch/pkg-real-i386/DEBIAN/control @@ -1,10 +1,10 @@ -Package: pkg-multi -Status: install ok half-installed -Priority: extra +Package: pkg-real +Version: 0 Section: test +Priority: extra Maintainer: Dpkg Developers <[email protected]> Architecture: i386 Multi-Arch: same -Version: 1.0 -Description: test package +Depends: pkg-v +Description: test package - depending on virtual diff --git a/t-conflict-provide-replace-virtual/pkg-a/DEBIAN/control b/t-conflict-provide-replace-virtual-multiarch/pkg-virt-amd64/DEBIAN/control similarity index 78% copy from t-conflict-provide-replace-virtual/pkg-a/DEBIAN/control copy to t-conflict-provide-replace-virtual-multiarch/pkg-virt-amd64/DEBIAN/control index 1dba668b6..312fafd06 100644 --- a/t-conflict-provide-replace-virtual/pkg-a/DEBIAN/control +++ b/t-conflict-provide-replace-virtual-multiarch/pkg-virt-amd64/DEBIAN/control @@ -1,9 +1,10 @@ -Package: pkg-a +Package: pkg-virt Version: 0 Section: test Priority: extra Maintainer: Dpkg Developers <[email protected]> -Architecture: all +Architecture: amd64 +Multi-Arch: same Conflicts: pkg-v Provides: pkg-v Replaces: pkg-v diff --git a/t-conflict-provide-replace-virtual/pkg-a/DEBIAN/control b/t-conflict-provide-replace-virtual-multiarch/pkg-virt-i386/DEBIAN/control similarity index 78% copy from t-conflict-provide-replace-virtual/pkg-a/DEBIAN/control copy to t-conflict-provide-replace-virtual-multiarch/pkg-virt-i386/DEBIAN/control index 1dba668b6..f1b171f21 100644 --- a/t-conflict-provide-replace-virtual/pkg-a/DEBIAN/control +++ b/t-conflict-provide-replace-virtual-multiarch/pkg-virt-i386/DEBIAN/control @@ -1,9 +1,10 @@ -Package: pkg-a +Package: pkg-virt Version: 0 Section: test Priority: extra Maintainer: Dpkg Developers <[email protected]> -Architecture: all +Architecture: i386 +Multi-Arch: same Conflicts: pkg-v Provides: pkg-v Replaces: pkg-v -- Dpkg.Org's dpkg
