diff options
author | Christian PERRIER <bubulle@debian.org> | 2013-08-17 07:58:13 +0200 |
---|---|---|
committer | Christian PERRIER <bubulle@debian.org> | 2013-08-17 07:58:13 +0200 |
commit | 010364b7b52af9f6f4d8cbb6391a721260b6ffb5 (patch) | |
tree | 3ea2ba749956270d53f4705a1358af01b3b060fe /test/integration/test-bug-618288-multiarch-same-lockstep | |
parent | 34b769c51ac7cf747fb9dc5b8a5697c1c292360b (diff) | |
parent | 488011fa99aee25bedb39ae2cc3115ad1ab000c0 (diff) |
Merge branch 'debian/sid' of git://git.debian.org/git/apt/apt into debian/sid
Diffstat (limited to 'test/integration/test-bug-618288-multiarch-same-lockstep')
-rwxr-xr-x | test/integration/test-bug-618288-multiarch-same-lockstep | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/integration/test-bug-618288-multiarch-same-lockstep b/test/integration/test-bug-618288-multiarch-same-lockstep index fde075172..e0305b64b 100755 --- a/test/integration/test-bug-618288-multiarch-same-lockstep +++ b/test/integration/test-bug-618288-multiarch-same-lockstep @@ -16,7 +16,7 @@ buildsimplenativepackage 'apt' 'i386' '2' 'unstable' 'Depends: libsame (= 2)' '' buildsimplenativepackage 'apt2' 'amd64' '2' 'unstable' 'Depends: libsame (= 2)' '' 'required' setupaptarchive -aptget dist-upgrade -s 2>&1 > output.apt +aptget dist-upgrade -s >output.apt 2>&1 # order in switch libsame:{amd64,i386} are unpacked is irrelevant, as both are installed - but we need to do it together LS_U_AMD="$(grep -o -n '^Inst libsame ' output.apt | cut -d: -f1)" |