diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2012-04-11 17:45:36 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2012-04-11 17:45:36 +0200 |
| commit | c3753d1de25737aed66d6ca14d0473042b7c55a7 (patch) | |
| tree | 750745b523fee36d66b4cdd041fc8117be22c5fe /test/integration/test-conflicts-loop | |
| parent | 621aeca0bc8fe39c57d6221c7581c758e5822fd0 (diff) | |
| parent | d68d65ad637526e46ea77ab83e07470d26df15fc (diff) | |
merged from donkults experimental branch
Diffstat (limited to 'test/integration/test-conflicts-loop')
| -rwxr-xr-x | test/integration/test-conflicts-loop | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/integration/test-conflicts-loop b/test/integration/test-conflicts-loop index 25f005969..4407fbd9d 100755 --- a/test/integration/test-conflicts-loop +++ b/test/integration/test-conflicts-loop @@ -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] |