diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2012-12-26 23:52:47 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2012-12-26 23:52:47 +0100 |
| commit | d2cca6ec46865a1f5167f846e67150dc19ca2022 (patch) | |
| tree | 43d335f69870a72b97fa41a1b208784b8753d354 /test/integration/test-conflicts-loop | |
| parent | 7735ad0500b6fefef03b2a3dc2a6843e82353e94 (diff) | |
| parent | d663a4c8a8723ae4936d10d0a98ea2c05a29cbc4 (diff) | |
merged from the debian-sid 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] |