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-very-tight-loop-configure-with-unpacking-new-packages | |
| 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-very-tight-loop-configure-with-unpacking-new-packages')
| -rwxr-xr-x | test/integration/test-very-tight-loop-configure-with-unpacking-new-packages | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages b/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages index c1d454f88..409d1212c 100755 --- a/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages +++ b/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages @@ -28,6 +28,7 @@ setupaptarchive testequalor2 'Reading package lists... Building dependency tree... +Calculating upgrade... The following NEW packages will be installed: ure The following packages will be upgraded: @@ -44,6 +45,7 @@ Conf libreoffice-core (4 sid [amd64]) Conf libreoffice-style-galaxy (4 sid [amd64]) Conf libreoffice (4 sid [amd64])' 'Reading package lists... Building dependency tree... +Calculating upgrade... The following NEW packages will be installed: ure The following packages will be upgraded: |