Moving apt pinning workaround to the correct place.

2 files changed, 18 insertions, 17 deletions

diff --git a/scripts/build/lb_chroot_apt b/scripts/build/lb_chroot_apt
index aa1db74bf..240fcecd1 100755
--- a/scripts/build/lb_chroot_apt
+++ b/scripts/build/lb_chroot_apt
@@ -133,14 +133,6 @@ case "${1}" in
 			esac
 		fi
 
-		# Rebuild apt indices from scratch.
-		# Due to the fact that apt doesn't understand pinning on the
-		# fly, we need to manuall remove the cached indices and fetch
-		# them again.
-		rm -f chroot/var/cache/apt/* > /dev/null 2>&1 || true
-		rm -f chroot/var/lib/apt/lists/* > /dev/null 2>&1 || true
-		Apt chroot update
-
 		# Creating stage file
 		Create_stagefile .stage/chroot_apt
 		;;
diff --git a/scripts/build/lb_chroot_sources b/scripts/build/lb_chroot_sources
index a4b3dcd0a..a864361a3 100755
--- a/scripts/build/lb_chroot_sources
+++ b/scripts/build/lb_chroot_sources
@@ -461,30 +461,39 @@ EOF
 				done
 			fi
 
-			# Installing aptitude
+			# Installing aptitude (FIXME)
 			if [ "${LB_APT}" = "aptitude" ] && [ ! -x /usr/bin/aptitude ]
 			then
 				Chroot chroot "apt-get ${APT_OPTIONS} update"
 				Chroot chroot "apt-get ${APT_OPTIONS} install aptitude"
 			fi
 
-			# Temporary hack (FIXME)
-			if [ "${LB_DERIVATIVE}" = "true" ]
-			then
-				_APT="--force-yes"
-			fi
+			# Rebuild apt indices from scratch.
+			# Due to the fact that apt doesn't understand
+			# pinning on the fly, we need to manually remove
+			# the cached indices and rebuild them again.
+			rm -rf chroot/var/cache/apt/*.bin
 
 			Apt chroot update
-			Apt chroot "upgrade ${_APT}"
-			Apt chroot "dist-upgrade ${_APT}"
 
 			# Installing keyring packages
 			if [ -n "${LB_KEYRING_PACKAGES}" ]
 			then
+				# Temporary hack (FIXME)
+				if [ "${LB_DERIVATIVE}" = "true" ]
+				then
+					_APT="--force-yes"
+				fi
+
 				Apt chroot "--force-yes install ${LB_KEYRING_PACKAGES}"
-				Apt chroot update
 			fi
 
+			rm -rf chroot/var/cache/apt/*.bin
+
+			Apt chroot update
+			Apt chroot "upgrade"
+			Apt chroot "dist-upgrade"
+
 			if [ "${LB_CACHE_INDICES}" = "true" ]
 			then
 				mkdir -p cache/indices_bootstrap