diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-10-13 15:36:54 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-10-13 15:36:54 +0200 |
| commit | 61153c284c832a0d0f7faecd9ad96f6cd9591c64 (patch) | |
| tree | a60d61b723bbc90b8b715a476c5f1ee5e8d6e0c2 /test/integration/test-bug-591882-conkeror | |
| parent | 940ff5d6b5634b57c2e622b5295f499a7807f3de (diff) | |
| parent | 6bea738672fb503d2813ae2d998096015a81c4a2 (diff) | |
merged from debian-sid branch
Diffstat (limited to 'test/integration/test-bug-591882-conkeror')
| -rwxr-xr-x | test/integration/test-bug-591882-conkeror | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/integration/test-bug-591882-conkeror b/test/integration/test-bug-591882-conkeror index b1dbb3a0a..e1c0b42d1 100755 --- a/test/integration/test-bug-591882-conkeror +++ b/test/integration/test-bug-591882-conkeror @@ -1,7 +1,7 @@ #!/bin/sh set -e -local TESTDIR=$(readlink -f $(dirname $0)) +TESTDIR=$(readlink -f $(dirname $0)) . $TESTDIR/framework setupenvironment configarchitecture "i386" @@ -34,8 +34,8 @@ The following packages will be upgraded: perl-base perl-modules readline-common sed ttf-dejavu-core ucf whiptail x11-common zlib1g 87 upgraded, 26 newly installed, 5 to remove and 0 not upgraded. -Need to get 0B/54.4MB of archives. -After this operation, 12.4MB of additional disk space will be used. +Need to get 0 B/54.4 MB of archives. +After this operation, 12.4 MB of additional disk space will be used. E: Trivial Only specified but this is not a trivial operation." UPGRADESUCCESS="Reading package lists... @@ -66,8 +66,8 @@ The following packages will be upgraded: perl-base perl-modules readline-common sed ttf-dejavu-core ucf whiptail x11-common zlib1g 88 upgraded, 30 newly installed, 4 to remove and 0 not upgraded. -Need to get 0B/62.9MB of archives. -After this operation, 36.0MB of additional disk space will be used. +Need to get 0 B/62.9 MB of archives. +After this operation, 36.0 MB of additional disk space will be used. E: Trivial Only specified but this is not a trivial operation." # Test that the old behavior can be restored with the option |