--resolve-deps is now default in debootstrap;

update.

1 files changed, 21 insertions, 25 deletions

diff --git a/testsuite/cdebootstrap/pbuilder-create-sid.log b/testsuite/cdebootstrap/pbuilder-create-sid.log
index ea38079..d2897e7 100644
--- a/testsuite/cdebootstrap/pbuilder-create-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-create-sid.log
@@ -301,8 +301,7 @@ P: Extracting bash
 P: Extracting findutils
 P: Extracting makedev
 O: Selecting previously deselected package base-passwd.
-O: (Reading database ... 
-O: 0 files and directories currently installed.)
+O: (Reading database ... 0 files and directories currently installed.)
 O: Unpacking base-passwd (from .../base-passwd_3.5.10_amd64.deb) ...
 P: Unpacking package base-passwd
 O: dpkg: base-passwd: dependency problems, but configuring anyway as you request:
@@ -837,7 +836,8 @@ P: Configuring package debconf
 O: 
 P: Configuring helper cdebootstrap-helper-apt
 O: Selecting previously deselected package cdebootstrap-helper-apt.
-O: (Reading database ... 4510 files and directories currently installed.)
+O: (Reading database ... 
+O: 4510 files and directories currently installed.)
 O: Unpacking cdebootstrap-helper-apt (from /cdebootstrap-helper-apt.deb) ...
 O: Setting up cdebootstrap-helper-apt (1) ...
 P: Configuring helper cdebootstrap-helper-diverts
@@ -850,23 +850,21 @@ O: Adding `diversion of /usr/sbin/invoke-rc.d to /usr/sbin/invoke-rc.d.REAL by c
 O: Setting up cdebootstrap-helper-diverts (1) ...
 P: Configuring helper cdebootstrap-helper-makedev
 O: Selecting previously deselected package cdebootstrap-helper-makedev.
-O: (Reading database ... 
-O: 4515 files and directories currently installed.)
+O: (Reading database ... 4515 files and directories currently installed.)
 O: Unpacking cdebootstrap-helper-makedev (from .../cdebootstrap-helper-makedev.deb) ...
 O: Setting up cdebootstrap-helper-makedev (1) ...
 O: 
 O: Selecting previously deselected package apt.
-O: (Reading database ... 
-O: 4515 files and directories currently installed.)
-O: Unpacking apt (from .../bootstrap/apt_0.6.42_amd64.deb) ...
+O: (Reading database ... 4515 files and directories currently installed.)
+O: Unpacking apt (from .../apt_0.6.42.1_amd64.deb) ...
 P: Unpacking package apt
-O: Setting up apt (0.6.42) ...
+O: Setting up apt (0.6.42.1) ...
 P: Configuring package apt
 O: 
 O: Get:1 bootstrap: . Release.gpg [189B]
 O: Get:2 bootstrap: . Release [4800B]
 O: Ign bootstrap: . Release
-O: Fetched 4989B in 0s (44.3kB/s)
+O: Fetched 4989B in 0s (46.4kB/s)
 O: Reading package lists...
 O: 
 O: W: 
@@ -876,7 +874,6 @@ O: W:
 O: You may want to run apt-get update to correct these problems
 O: 
 O: Reading package lists...
-O: 
 O: Building dependency tree...
 O: 
 O: Suggested packages:
@@ -906,7 +903,6 @@ O:   liblzo1 libncursesw5 libopencdk8 libpopt0 libssl0.9.8 libtasn1-2 libwrap0
 O:   logrotate man-db manpages nano netkit-inetd tcpd netbase nvi tasksel wget
 O:   whiptail exim4-config exim4-base libgnutls12 libpcre3 exim4-daemon-light at
 O:   exim4 telnet dhcp3-common dhcp3-client psmisc
-O: debconf: delaying package configuration, since apt-utils is not installed
 O: Authentication warning overridden.
 O: Selecting previously deselected package console-data.
 O: (Reading database ... 
@@ -923,13 +919,13 @@ O: Selecting previously deselected package console-common.
 O: Unpacking console-common (from .../console-common_0.7.54_all.deb) ...
 P: Unpacking package console-common
 O: Selecting previously deselected package adduser.
-O: Unpacking adduser (from .../bootstrap/adduser_3.74_all.deb) ...
+O: Unpacking adduser (from .../bootstrap/adduser_3.77_all.deb) ...
 P: Unpacking package adduser
 O: Selecting previously deselected package libdb4.2.
 O: Unpacking libdb4.2 (from .../libdb4.2_4.2.52-20_amd64.deb) ...
 P: Unpacking package libdb4.2
 O: Selecting previously deselected package apt-utils.
-O: Unpacking apt-utils (from .../apt-utils_0.6.42_amd64.deb) ...
+O: Unpacking apt-utils (from .../apt-utils_0.6.42.1_amd64.deb) ...
 P: Unpacking package apt-utils
 O: Selecting previously deselected package libsigc++-1.2-5c2.
 O: Unpacking libsigc++-1.2-5c2 (from .../libsigc++-1.2-5c2_1.2.5-5_amd64.deb) ...
@@ -974,7 +970,7 @@ O: Selecting previously deselected package iptables.
 O: Unpacking iptables (from .../iptables_1.3.3-2_amd64.deb) ...
 P: Unpacking package iptables
 O: Selecting previously deselected package iputils-ping.
-O: Unpacking iputils-ping (from .../iputils-ping_20020927-2_amd64.deb) ...
+O: Unpacking iputils-ping (from .../iputils-ping_20020927-3_amd64.deb) ...
 P: Unpacking package iputils-ping
 O: Selecting previously deselected package sysklogd.
 O: Unpacking sysklogd (from .../sysklogd_1.4.1-17_amd64.deb) ...
@@ -1084,12 +1080,12 @@ P: Unpacking package psmisc
 O: Setting up libconsole (0.2.3dbs-57) ...
 P: Configuring package libconsole
 O: 
-O: Setting up adduser (3.74) ...
+O: Setting up adduser (3.77) ...
 P: Configuring package adduser
 O: 
 O: Setting up libdb4.2 (4.2.52-20) ...
 P: Configuring package libdb4.2
-O: Setting up apt-utils (0.6.42) ...
+O: Setting up apt-utils (0.6.42.1) ...
 P: Configuring package apt-utils
 O: 
 O: Setting up libsigc++-1.2-5c2 (1.2.5-5) ...
@@ -1137,7 +1133,7 @@ O:
 O: Setting up iptables (1.3.3-2) ...
 P: Configuring package iptables
 O: 
-O: Setting up iputils-ping (20020927-2) ...
+O: Setting up iputils-ping (20020927-3) ...
 P: Configuring package iputils-ping
 O: Setting up laptop-detect (0.12.1) ...
 P: Configuring package laptop-detect
@@ -1269,18 +1265,18 @@ P: Configuring package base-config
 O: 
 P: Deconfiguring helper cdebootstrap-helper-apt
 O: (Reading database ... 
-O: 7416 files and directories currently installed.)
+O: 7410 files and directories currently installed.)
 O: Removing cdebootstrap-helper-apt ...
 P: Deconfiguring helper cdebootstrap-helper-diverts
 O: (Reading database ... 
-O: 7415 files and directories currently installed.)
+O: 7409 files and directories currently installed.)
 O: Removing cdebootstrap-helper-diverts ...
 O: Purging configuration files for cdebootstrap-helper-diverts ...
 O: Removing `diversion of /sbin/start-stop-daemon to /sbin/start-stop-daemon.REAL by cdebootstrap-helper-diverts'
 O: Removing `diversion of /usr/sbin/invoke-rc.d to /usr/sbin/invoke-rc.d.REAL by cdebootstrap-helper-diverts'
 P: Deconfiguring helper cdebootstrap-helper-makedev
 O: (Reading database ... 
-O: 7413 files and directories currently installed.)
+O: 7407 files and directories currently installed.)
 O: Removing cdebootstrap-helper-makedev ...
 O: Reading package lists...
 O: 
@@ -1296,7 +1292,7 @@ Get:1 http://ftp.jp.debian.org sid Release.gpg [189B]
 Get:2 http://ftp.jp.debian.org sid Release [4800B]
 Ign http://ftp.jp.debian.org sid Release
 Get:3 http://ftp.jp.debian.org sid/main Packages [3726kB]
-Fetched 3731kB in 1s (1903kB/s)
+Fetched 3731kB in 2s (1845kB/s)
 Reading package lists...
 W: GPG error: http://ftp.jp.debian.org sid Release: Could not execute /usr/bin/gpgv to verify signature (is gnupg installed?)
 W: You may want to run apt-get update to correct these problems
@@ -1330,7 +1326,7 @@ WARNING: The following packages cannot be authenticated!
   libstdc++6-4.0-dev g++-4.0 g++ linux-kernel-headers libc6-dev
   build-essential
 Selecting previously deselected package binutils.
-(Reading database ... 7413 files and directories currently installed.)
+(Reading database ... 7407 files and directories currently installed.)
 Unpacking binutils (from .../binutils_2.16.1cvs20050902-1_amd64.deb) ...
 Selecting previously deselected package cpp-4.0.
 Unpacking cpp-4.0 (from .../cpp-4.0_4.0.2-2_amd64.deb) ...
@@ -1386,6 +1382,6 @@ Setting up build-essential (11.1) ...
 Copying back the cached apt archive contents
  -> unmounting dev/pts filesystem
  -> unmounting proc filesystem
- -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.uiwnkH/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.EXa4vQ/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//3477 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//5301 and its subdirectories