workaround Matt's commit;

add ||true for 'ln -s' creating mtab.

1 files changed, 37 insertions, 18 deletions

diff --git a/testsuite/cdebootstrap/pbuilder-update-etch-sid.log b/testsuite/cdebootstrap/pbuilder-update-etch-sid.log
index 583210a..4922555 100644
--- a/testsuite/cdebootstrap/pbuilder-update-etch-sid.log
+++ b/testsuite/cdebootstrap/pbuilder-update-etch-sid.log
@@ -1,9 +1,10 @@
 Upgrading for distribution sid
 Building the build Environment
- -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.wX4Lty/testimage]
+ -> extracting base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Ar4B6q/testimage]
  -> creating local configuration
  -> copying local configuration
  -> mounting /proc filesystem
+ln: `/var/cache/pbuilder/build//31582/etc/mtab': File exists
  -> mounting /dev/pts filesystem
  -> policy-rc.d already exists
   -> Installing apt-lines
@@ -13,7 +14,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 [3714kB]
-Fetched 3719kB in 2s (1769kB/s)
+Fetched 3719kB in 2s (1804kB/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
@@ -22,16 +23,17 @@ Obtaining the cached apt archive contents
 Reading package lists...
 Building dependency tree...
 The following packages will be upgraded:
-  adduser binutils grep iputils-ping libc6 libc6-dev libdb3 libdb4.2 libdb4.3
-  libncurses5 libncursesw5 libtext-wrapi18n-perl login lsb-base nano
-  ncurses-base ncurses-bin net-tools passwd sed tar zlib1g
-22 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/14.5MB of archives.
-After unpacking 877kB of additional disk space will be used.
+  adduser apt apt-utils binutils cpio grep info iputils-ping libc6 libc6-dev
+  libdb3 libdb4.2 libdb4.3 libncurses5 libncursesw5 libtext-wrapi18n-perl
+  login lsb-base nano ncurses-base ncurses-bin net-tools passwd sed tar zlib1g
+26 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
+Need to get 0B/16.3MB of archives.
+After unpacking 909kB of additional disk space will be used.
 WARNING: The following packages cannot be authenticated!
-  grep login ncurses-bin sed tar libc6-dev libc6 libncurses5 ncurses-base
-  passwd zlib1g adduser iputils-ping libdb4.2 libncursesw5 nano net-tools
-  libdb3 libdb4.3 libtext-wrapi18n-perl lsb-base binutils
+  grep login ncurses-bin sed tar libc6-dev libc6 libncurses5 ncurses-base apt
+  passwd zlib1g adduser libdb4.2 apt-utils cpio info iputils-ping libncursesw5
+  nano net-tools libdb3 libdb4.3 libtext-wrapi18n-perl lsb-base binutils
+Preconfiguring packages ...
 (Reading database ... 11767 files and directories currently installed.)
 Preparing to replace grep 2.5.1.ds2-1 (using .../grep_2.5.1.ds2-2_amd64.deb) ...
 Unpacking replacement grep ...
@@ -65,8 +67,8 @@ Unpacking replacement libc6 ...
 Setting up libc6 (2.3.5-7) ...
 Installing new version of config file /etc/init.d/glibc.sh ...
 Current default timezone: 'UTC'.
-Local time is now:      Tue Nov  1 03:39:49 UTC 2005.
-Universal Time is now:  Tue Nov  1 03:39:49 UTC 2005.
+Local time is now:      Wed Nov  2 12:57:27 UTC 2005.
+Universal Time is now:  Wed Nov  2 12:57:27 UTC 2005.
 Run 'tzconfig' if you wish to change it.
 
 (Reading database ... 11772 files and directories currently installed.)
@@ -79,6 +81,11 @@ Preparing to replace ncurses-base 5.4-9 (using .../ncurses-base_5.5-1_all.deb) .
 Unpacking replacement ncurses-base ...
 Setting up ncurses-base (5.5-1) ...
 (Reading database ... 11772 files and directories currently installed.)
+Preparing to replace apt 0.6.42.1 (using .../apt_0.6.42.2_amd64.deb) ...
+Unpacking replacement apt ...
+Setting up apt (0.6.42.2) ...
+
+(Reading database ... 11772 files and directories currently installed.)
 Preparing to replace passwd 1:4.0.13-1 (using .../passwd_1%3a4.0.13-3_amd64.deb) ...
 Unpacking replacement passwd ...
 Setting up passwd (4.0.13-3) ...
@@ -91,10 +98,16 @@ Setting up zlib1g (1.2.3-6) ...
 (Reading database ... 11772 files and directories currently installed.)
 Preparing to replace adduser 3.67.2 (using .../archives/adduser_3.77_all.deb) ...
 Unpacking replacement adduser ...
-Preparing to replace iputils-ping 3:20020927-2 (using .../iputils-ping_3%3a20020927-3_amd64.deb) ...
-Unpacking replacement iputils-ping ...
 Preparing to replace libdb4.2 4.2.52-18 (using .../libdb4.2_4.2.52-20_amd64.deb) ...
 Unpacking replacement libdb4.2 ...
+Preparing to replace apt-utils 0.6.42.1 (using .../apt-utils_0.6.42.2_amd64.deb) ...
+Unpacking replacement apt-utils ...
+Preparing to replace cpio 2.6-8 (using .../archives/cpio_2.6-9_amd64.deb) ...
+Unpacking replacement cpio ...
+Preparing to replace info 4.8-1 (using .../archives/info_4.8-2_amd64.deb) ...
+Unpacking replacement info ...
+Preparing to replace iputils-ping 3:20020927-2 (using .../iputils-ping_3%3a20020927-3_amd64.deb) ...
+Unpacking replacement iputils-ping ...
 Preparing to replace libncursesw5 5.4-9 (using .../libncursesw5_5.5-1_amd64.deb) ...
 Unpacking replacement libncursesw5 ...
 Preparing to replace nano 1.3.8-2 (using .../nano_1.3.9-1_amd64.deb) ...
@@ -114,8 +127,14 @@ Unpacking replacement binutils ...
 Setting up libc6-dev (2.3.5-7) ...
 Setting up adduser (3.77) ...
 
-Setting up iputils-ping (20020927-3) ...
 Setting up libdb4.2 (4.2.52-20) ...
+Setting up apt-utils (0.6.42.2) ...
+
+Setting up cpio (2.6-9) ...
+
+Setting up info (4.8-2) ...
+
+Setting up iputils-ping (20020927-3) ...
 Setting up libncursesw5 (5.5-1) ...
 
 Setting up nano (1.3.9-1) ...
@@ -137,6 +156,6 @@ apt is already the newest version.
 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.wX4Lty/testimage]
+ -> creating base tarball [/home/dancer/cvscheckout/external/pbuilder/pbuilder/testsuite/tmp.Ar4B6q/testimage]
  -> cleaning the build env 
-    -> removing directory /var/cache/pbuilder/build//29446 and its subdirectories
+    -> removing directory /var/cache/pbuilder/build//31582 and its subdirectories