summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2012-03-12 19:30:48 +0100
committerDavid Kalnischkies <kalnischkies@gmail.com>2012-03-12 19:30:48 +0100
commit90436124e1957f685673f0926a3cd8edc6d2fcdf (patch)
treedd754afdf57ef2da2248dc27794a1a2ab271c513 /test
parent670cf3542be6a079d6288c36d3b6a14877f8b5f9 (diff)
ensure that the fullname of a package is displayed in the debug output
Diffstat (limited to 'test')
-rwxr-xr-xtest/integration/test-conflicts-loop10
1 files changed, 5 insertions, 5 deletions
diff --git a/test/integration/test-conflicts-loop b/test/integration/test-conflicts-loop
index 7b5724d74..233077ef5 100755
--- a/test/integration/test-conflicts-loop
+++ b/test/integration/test-conflicts-loop
@@ -20,14 +20,14 @@ 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 conflicts with openjdk-6-jre
- openjdk-6-jre conflicts with openjdk-6-jre-headless
- openjdk-6-jre-headless conflicts with openjdk-6-jre
+ 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
Remv openjdk-6-jre [6b16-1.8-0ubuntu1]
- openjdk-6-jre-headless conflicts with openjdk-6-jre-lib
+ openjdk-6-jre-headless:i386 conflicts with openjdk-6-jre-lib:i386
Remv openjdk-6-jre-lib [6b16-1.8-0ubuntu1]
Inst openjdk-6-jre-headless [6b16-1.8-0ubuntu1] (6b20-1.9.8-0ubuntu1~10.04.1 unstable [i386])
- openjdk-6-jre conflicts with openjdk-6-jre-lib
+ openjdk-6-jre:i386 conflicts with openjdk-6-jre-lib:i386
Inst openjdk-6-jre [6b16-1.8-0ubuntu1] (6b20-1.9.8-0ubuntu1~10.04.1 unstable [i386])
Inst openjdk-6-jre-lib [6b16-1.8-0ubuntu1] (6b20-1.9.8-0ubuntu1~10.04.1 unstable [i386])
Conf openjdk-6-jre-lib (6b20-1.9.8-0ubuntu1~10.04.1 unstable [i386])