[SCM] live-build branch, debian-next, updated. debian/3.0_a19-1-7-g01a5160

Daniel Baumann daniel at debian.org
Sat Jun 11 11:34:42 UTC 2011


The following commit has been merged in the debian-next branch:
commit 01a5160847bea129e11dda5959edd104d75fcda2
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Jun 11 13:35:05 2011 +0200

    Always disable dpkg sync, we only support squeeze and newer anyway.

diff --git a/scripts/build/lb_chroot_dpkg b/scripts/build/lb_chroot_dpkg
index 144bfdf..25795a3 100755
--- a/scripts/build/lb_chroot_dpkg
+++ b/scripts/build/lb_chroot_dpkg
@@ -54,15 +54,11 @@ EOF
 		chmod 755 chroot/sbin/start-stop-daemon
 
 		# Disable dpkg syncing
-		if echo 'dpkg --compare-versions "$(dpkg-query -W --showformat="\${Version}" dpkg)" ge 1.15.8.6' | Chroot chroot sh
-		then
 
 cat > chroot/etc/dpkg/dpkg.cfg.d/live-build << EOF
 force-unsafe-io
 EOF
 
-		fi
-
 		# Manual hacks for special packages
 
 		# samhain

-- 
live-build



More information about the debian-live-changes mailing list