]> git.saurik.com Git - apt.git/blobdiff - test/integration/test-conflicts-loop
Merge remote-tracking branch 'mvo/debian/sid' into debian/sid
[apt.git] / test / integration / test-conflicts-loop
index 25f0059699b2c7458a98f81aff28142054c1a7b2..4407fbd9d8274ffa8529b2f6d6b86167fd9ea643 100755 (executable)
@@ -19,10 +19,10 @@ testequal 'Reading package lists...
 Building dependency tree...
 The following packages will be upgraded:
   openjdk-6-jre openjdk-6-jre-headless openjdk-6-jre-lib
-3 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
   openjdk-6-jre-lib:i386 conflicts with openjdk-6-jre:i386
     openjdk-6-jre:i386 conflicts with openjdk-6-jre-headless:i386
       openjdk-6-jre-headless:i386 conflicts with openjdk-6-jre:i386
+3 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
 Remv openjdk-6-jre [6b16-1.8-0ubuntu1]
       openjdk-6-jre-headless:i386 conflicts with openjdk-6-jre-lib:i386
 Remv openjdk-6-jre-lib [6b16-1.8-0ubuntu1]