diff options
| author | Michael Vogt <mvo@debian.org> | 2014-09-29 09:58:38 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-09-29 09:58:38 +0200 |
| commit | 4c333a25a88b1afac2ed50bf1b9af61dc5b09343 (patch) | |
| tree | d4b90a7bc46e9da364efb74365a0af604b38e424 /test/integration/test-xorg-break-providers | |
| parent | bca84917c326fa3158e120147c8aecebe0789b47 (diff) | |
| parent | 6eb377fb9fba6b7f17f635143e9201f0d62a50fb (diff) | |
Merge remote-tracking branch 'upstream/debian/experimental' into feature/acq-trans
Conflicts:
apt-pkg/acquire-item.cc
apt-pkg/acquire-item.h
methods/gpgv.cc
Diffstat (limited to 'test/integration/test-xorg-break-providers')
| -rwxr-xr-x | test/integration/test-xorg-break-providers | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/test/integration/test-xorg-break-providers b/test/integration/test-xorg-break-providers index 139d2c915..0be57d979 100755 --- a/test/integration/test-xorg-break-providers +++ b/test/integration/test-xorg-break-providers @@ -26,6 +26,7 @@ E: Trivial Only specified but this is not a trivial operation.' aptget install x testequal 'Reading package lists... Building dependency tree... +Calculating upgrade... The following packages will be upgraded: xserver-xorg-core xserver-xorg-video-intel 2 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. @@ -35,6 +36,7 @@ E: Trivial Only specified but this is not a trivial operation.' aptget upgrade - testequal 'Reading package lists... Building dependency tree... +Calculating upgrade... The following packages will be upgraded: xserver-xorg-core xserver-xorg-video-intel 2 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. |