diff options
| author | Michael Vogt <mvo@debian.org> | 2014-05-07 17:55:10 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-05-07 17:55:10 +0200 |
| commit | 38d2959ffb8c6f5f291b2910014a67b1b352ab4c (patch) | |
| tree | c5977b8f34aaf973ed3956952ec3ff43ac59f143 /test/integration/test-prevent-markinstall-multiarch-same-versionscrew | |
| parent | fce69e7a0f38299c57ef96ae1c1dd9a5379bfd5a (diff) | |
| parent | 3fa4e98f62e469f4292d2811b4e15f4afb678fbd (diff) | |
Merge branch 'debian/sid' into debian/experimental
Conflicts:
apt-pkg/cachefilter.h
apt-pkg/contrib/fileutl.cc
apt-pkg/contrib/netrc.h
apt-pkg/deb/debsrcrecords.cc
apt-pkg/init.h
apt-pkg/pkgcache.cc
debian/apt.install.in
debian/changelog
Diffstat (limited to 'test/integration/test-prevent-markinstall-multiarch-same-versionscrew')
| -rwxr-xr-x | test/integration/test-prevent-markinstall-multiarch-same-versionscrew | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/integration/test-prevent-markinstall-multiarch-same-versionscrew b/test/integration/test-prevent-markinstall-multiarch-same-versionscrew index fed12dad0..d647856cb 100755 --- a/test/integration/test-prevent-markinstall-multiarch-same-versionscrew +++ b/test/integration/test-prevent-markinstall-multiarch-same-versionscrew @@ -55,14 +55,14 @@ Remv out-of-sync-gone-foreign:i386 [1] Remv out-of-sync-gone-native [1] Inst fine [1] (2 unstable [amd64]) [fine:amd64 on fine:i386] [fine:i386 on fine:amd64] [fine:i386 ] Inst fine:i386 [1] (2 unstable [i386]) -Conf fine (2 unstable [amd64]) -Conf fine:i386 (2 unstable [i386]) Inst fine-installed [1] (2 unstable [amd64]) [fine-installed:amd64 on fine-installed:i386] [fine-installed:i386 on fine-installed:amd64] [fine-installed:i386 ] Inst fine-installed:i386 [1] (2 unstable [i386]) -Conf fine-installed (2 unstable [amd64]) -Conf fine-installed:i386 (2 unstable [i386]) Inst out-of-sync-gone-foreign [1] (2 unstable [amd64]) Inst out-of-sync-gone-native:i386 [1] (2 unstable [i386]) +Conf fine:i386 (2 unstable [i386]) +Conf fine (2 unstable [amd64]) +Conf fine-installed:i386 (2 unstable [i386]) +Conf fine-installed (2 unstable [amd64]) Conf out-of-sync-gone-foreign (2 unstable [amd64]) Conf out-of-sync-gone-native:i386 (2 unstable [i386])' aptget dist-upgrade -s #-o Debug::pkgDepCache::Marker=1 |