diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2012-08-28 12:00:57 +0200 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2012-08-28 12:00:57 +0200 |
commit | 88be391791cd77312f19816904ced54d308dd706 (patch) | |
tree | b6703fffb3b4e30da8bcf2470587a31ab2c0b032 /test/integration/test-bug-632221-cross-dependency-satisfaction | |
parent | 4e5e7371044be194c545dc31c8a1d03ed1b659b4 (diff) | |
parent | d7bc74a4e44c4ff97e70f15e19f86761687f2ca5 (diff) |
merged from the debian-sid branch
Diffstat (limited to 'test/integration/test-bug-632221-cross-dependency-satisfaction')
-rwxr-xr-x | test/integration/test-bug-632221-cross-dependency-satisfaction | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/integration/test-bug-632221-cross-dependency-satisfaction b/test/integration/test-bug-632221-cross-dependency-satisfaction index 208c613a2..d90a103c9 100755 --- a/test/integration/test-bug-632221-cross-dependency-satisfaction +++ b/test/integration/test-bug-632221-cross-dependency-satisfaction @@ -21,7 +21,7 @@ insertpackage 'unstable' 'foreigner' 'amd64,armel' '1.0' 'Multi-Arch: foreign' insertpackage 'unstable' 'arm-stuff' 'armel' '1.0' insertpackage 'unstable' 'linux-stuff' 'amd64,armel' '1.0' -insertsource 'unstable' 'apt' 'any' '0.8.15' 'Build-Depends: doxygen, libc6-dev, libc6-dev:native, cool:any, amdboot:amd64, foreigner, libfwibble-dev, arm-stuff [any-arm] | linux-stuff [ linux-any]' +insertsource 'unstable' 'apt' 'any' '0.8.15' 'Build-Depends: doxygen, libc6-dev, libc6-dev:native, cool:any, amdboot:amd64, foreigner, libfwibble-dev, arm-stuff [any-armel] | linux-stuff [ linux-any]' insertsource 'unstable' 'forbidden-none' 'any' '1' 'Build-Depends: amdboot:any' insertsource 'unstable' 'forbidden-same' 'any' '1' 'Build-Depends: libc6:any' @@ -63,6 +63,7 @@ Inst libc6 (1.0 unstable [amd64]) Inst specific (1.0 unstable [amd64]) Conf libc6 (1.0 unstable [amd64]) Conf specific (1.0 unstable [amd64])' aptget build-dep source-specific-amd64 -s -a armel + testequal 'Reading package lists... Building dependency tree... The following NEW packages will be installed: |