[pkg-fso-commits] [SCM] Various non-packaged files branch, master, updated. c7d6447ca108ec2bba302c89db616ecf5cb952d1

[Steffen Moeller]

The following commit has been merged in the master branch:
commit db17b429541b1fd2885a0da35830c385411cfcdd
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Aug 23 00:31:04 2009 +0200

    Installing CDEBOOTSTRAP_EXTRA packages with apt.

diff --git a/install.sh b/install.sh
index 7fa7c87..397bd79 100755
--- a/install.sh
+++ b/install.sh
@@ -811,10 +811,11 @@ action_debian () {
 		CDEBOOTSTRAP_EXTRA_FLAGS="$CDEBOOTSTRAP_EXTRA_FLAGS -v"
 	fi
 	cdebootstrap-static $CDEBOOTSTRAP_EXTRA_FLAGS --allow-unauthenticated --flavour $CDEBOOTSTRAP_FLAVOUR \
-		--include=$CDEBOOTSTRAP_EXTRA_PACKAGES \
 		--exclude=$CDEBOOTSTRAP_EXCLUDE_PACKAGES sid "$INST_DIR" $INST_MIRROR
+	# Bug #542955 (won't fix) directs us to use apt-get for versioned (direct or indirect) dependencies
+	# The CDEBOOTSTRAP_EXTRA_PACKAGES are consequently installed in the action_apt
 
-	echo "I: Basic Debian system installed"
+	echo "I: Basic Debian system installed - please also install apt"
 }
 
 
@@ -863,6 +864,9 @@ __END__
 	echo " * Installing pkg-fso keyring"
 	chroot $INST_DIR apt-get $APT_OPTIONS install pkg-fso-keyring
 
+	echo " * Completing install of Debian basic packages to circumvent bug #542955"
+	chroot "$INST_DIR" apt-get $APT_OPTIONS install $(echo $CDEBOOTSTRAP_EXTRA_PACKAGES | tr "," " ")
+
 	echo " * Cleaning APT cache"
 	chroot $INST_DIR apt-get clean
 

-- 
Various non-packaged files