--- a/dev/chroot-test/action/install-installables Tue Sep 06 17:12:57 2011 +0100
+++ b/dev/chroot-test/action/install-installables Wed Sep 07 10:56:24 2011 +0100
@@ -1,5 +1,12 @@
-aptitude --allow-untrusted --quiet --without-recommends --assume-yes install \
- make mercurial xsltproc docbook-xsl openssh-server \
- python python-support adduser
-cd mercurial-server
-make setup-adduser
+if $CHROOT_TEST_INSTALLDEB ; then
+ aptitude --allow-untrusted --quiet --without-recommends --assume-yes install \
+ debconf python python-support adduser openssh-server ucf
+ echo dpkg -i /var/cache/apt/archives/mercurial-common_*.deb /var/cache/apt/archives/mercurial_*.deb *.deb
+ dpkg -i /var/cache/apt/archives/mercurial-common_*.deb /var/cache/apt/archives/mercurial_*.deb *.deb
+else
+ aptitude --allow-untrusted --quiet --without-recommends --assume-yes install \
+ make mercurial xsltproc docbook-xsl openssh-server \
+ python python-support adduser
+ cd mercurial-server
+ make setup-adduser
+fi