[Debian-live-changes] r1925 - in dists/trunk/live-helper: docs functions helpers

[otavio at alioth.debian.org]

Author: otavio
Date: 2007-06-02 19:33:01 +0000 (Sat, 02 Jun 2007)
New Revision: 1925

Modified:
   dists/trunk/live-helper/docs/ChangeLog
   dists/trunk/live-helper/functions/defaults.sh
   dists/trunk/live-helper/helpers/lh_chroot_apt
   dists/trunk/live-helper/helpers/lh_config
Log:
Add support to specify the apt/aptitude pipeline depth.


Modified: dists/trunk/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog	2007-06-02 18:16:27 UTC (rev 1924)
+++ dists/trunk/live-helper/docs/ChangeLog	2007-06-02 19:33:01 UTC (rev 1925)
@@ -1,3 +1,7 @@
+2007-06-02  Otavio Salvador  <otavio at debian.org>
+
+	* Add support to specify the apt/aptitude pipeline depth.
+
 2007-06-02  Daniel Baumann  <daniel at debian.org>
 
 	* Applied patches from Otavio Salvador <otavio at debian.org>:

Modified: dists/trunk/live-helper/functions/defaults.sh
===================================================================
--- dists/trunk/live-helper/functions/defaults.sh	2007-06-02 18:16:27 UTC (rev 1924)
+++ dists/trunk/live-helper/functions/defaults.sh	2007-06-02 19:33:01 UTC (rev 1925)
@@ -80,6 +80,9 @@
 	# Setting apt pdiffs
 	LH_APT_PDIFFS="${LH_APT_PDIFFS:-enabled}"
 
+	# Setting apt pipeline
+	# LH_APT_PIPELINE
+
 	# Setting apt recommends
 	LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS:-enabled}"
 

Modified: dists/trunk/live-helper/helpers/lh_chroot_apt
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_apt	2007-06-02 18:16:27 UTC (rev 1924)
+++ dists/trunk/live-helper/helpers/lh_chroot_apt	2007-06-02 19:33:01 UTC (rev 1925)
@@ -71,6 +71,12 @@
 				;;
 		esac
 
+		# Configuring apt pipeline
+		if [ -n "${LH_APT_PIPELINE}" ]
+		then
+			echo "Acquire::http::Pipeline-Depth \"${LH_APT_PIPELINE}\";" > chroot/etc/apt/apt.conf.d/00pipeline
+		fi
+
 		# Configuring apt recommends
 		if [ "${LH_APT}" = "aptitude" ]
 		then
@@ -84,7 +90,6 @@
 					;;
 			esac
 		fi
-
 		# Configuring apt secure
 		case "${LH_APT_SECURE}" in
 			enabled)
@@ -118,6 +123,9 @@
 		# Deconfiguring aptitude pdiffs
 		rm -f chroot/etc/apt/apt.conf.d/00pdiffs
 
+		# Deconfiguring aptitude pipeline
+		rm -f chroot/etc/apt/apt.conf.d/00pipeline
+
 		# Deconfiguring aptitude recommends
 		rm -f chroot/etc/apt/apt.conf.d/00recommends
 

Modified: dists/trunk/live-helper/helpers/lh_config
===================================================================
--- dists/trunk/live-helper/helpers/lh_config	2007-06-02 18:16:27 UTC (rev 1924)
+++ dists/trunk/live-helper/helpers/lh_config	2007-06-02 19:33:01 UTC (rev 1925)
@@ -76,6 +76,10 @@
 # (Default: ${LH_APT_PDIFFS})
 LH_APT_PDIFFS="${LH_APT_PDIFFS}"
 
+# \$LH_APT_PIPELINE: set apt/aptitude pipeline depth
+# (Default: ${LH_APT_PIPELINE})
+LH_APT_PIPELINE="${LH_APT_PIPELINE}"
+
 # \$LH_APT_RECOMMENDS: set apt/aptitude recommends
 # (Default: ${LH_APT_RECOMMENDS})
 LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}"