[SCM] live-build branch, debian, updated. debian/3.0_a25-1-57-g6167d10

Daniel Baumann daniel at debian.org
Thu Aug 4 19:53:17 UTC 2011


The following commit has been merged in the debian branch:
commit a90294ff53986f030cc1fde23ce4c2a23f545eb3
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Jul 19 12:39:47 2011 +0200

    Calling dpkg-divert with --quiet in chroot_dpkg.

diff --git a/scripts/build/lb_chroot_dpkg b/scripts/build/lb_chroot_dpkg
index 3194c04..7daf7bf 100755
--- a/scripts/build/lb_chroot_dpkg
+++ b/scripts/build/lb_chroot_dpkg
@@ -71,7 +71,7 @@ EOF
 		fi
 
 		# flash-kernel
-		Chroot chroot dpkg-divert --rename --add /usr/sbin/flash-kernel
+		Chroot chroot dpkg-divert --rename --quiet --add /usr/sbin/flash-kernel
 		ln -s /bin/true chroot/usr/sbin/flash-kernel
 
 		# Creating stage file
@@ -91,7 +91,7 @@ EOF
 
 		# flash-kernel
 		rm -f chroot/usr/sbin/flash-kernel
-		Chroot chroot dpkg-divert --rename --remove /usr/sbin/flash-kernel
+		Chroot chroot dpkg-divert --rename --quiet --remove /usr/sbin/flash-kernel
 
 		# samhain
 		if [ -e /var/state/samhain/samhain_file.orig ]

-- 
live-build



More information about the debian-live-changes mailing list