# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1215194317 0
# Node ID 187f770d30cbd47eab9df7a2b41180eb02a5d89c
# Parent  9e6adc3b16a128ae59dc020225717b9b6c58789e
Install dependancies *before* package

diff -r 9e6adc3b16a1 -r 187f770d30cb tazpkg
--- a/tazpkg	Thu Jul 03 19:43:52 2008 +0000
+++ b/tazpkg	Fri Jul 04 17:58:37 2008 +0000
@@ -321,6 +321,13 @@
 # Check for missing deps listed in a receipt packages.
 check_for_deps()
 {
+	local saved;
+	saved=$PACKAGE
+	mkdir -p $TMP_DIR
+	( cd $TMP_DIR ; cpio -i receipt ) < $PACKAGE_FILE
+	. $TMP_DIR/receipt
+	PACKAGE=$saved
+	rm -rf $TMP_DIR
 	for i in $DEPENDS
 	do
 		if [ ! -d "$INSTALLED/$i" ]; then
@@ -880,12 +887,12 @@
 		if [ "$DO_CHECK" = "yes" ]; then
 			check_for_installed_package
 		fi
-		install_package
 		# Resolv package deps.
 		check_for_deps
 		if [ ! "$MISSING_PACKAGE" = "" ]; then
 			install_deps
 		fi
+		install_package
 		;;
 	install-list|get-install-list)
 		# Install a set of packages from a list.
@@ -1434,11 +1441,11 @@
 			download $PACKAGE.tazpkg
 		fi
 		PACKAGE_FILE=$CACHE_DIR/$PACKAGE.tazpkg
-		install_package
 		check_for_deps
 		if [ ! "$MISSING_PACKAGE" = "" ]; then
 			install_deps
 		fi
+		install_package
 		;;
 	clean-cache)
 		# Remove all downloaded packages.