# HG changeset patch
# User Francisco J Ballesteros <nemo.mbox@gmail.com>
# Date 1316195458 -7200
# Node ID f2c0a67fca658301215f0a7c1093ad61f458ce68
# Parent  9a1c2baa23613bdda9a63543c5086180aaaffa5e
pm/install fix: don't pull before checking if
it's already installed. you are pulling for nothing.

R=john, rminnich, nemo
CC=nix-dev, nix-devs
http://codereview.appspot.com/5015050

diff -r 9a1c2baa2361 -r f2c0a67fca65 rc/bin/pm/install
--- a/rc/bin/pm/install	Fri Sep 16 18:11:31 2011 +0200
+++ b/rc/bin/pm/install	Fri Sep 16 19:50:58 2011 +0200
@@ -81,15 +81,14 @@
 		# Go to the directory if it exists
 		cd $PKGROOT^/contrib/packages/^$PKGNAME || fail $PKGNAME: No such package in $PKGROOT^/contrib/packages
 		
-		# You need to do mk pull before running mk install
-		if (! test -e root.tgz) {
-			echo $PKGNAME^: pulling
-			pm/pull $PKGNAME || fail $PKGNAME: pull failed
-		}
 		if (grep '^'^$PKGNAME^'$' $ROOT^/contrib/packages/installed >[2=1] >/dev/null) {
 			echo $PKGNAME^: already installed, skipping.
 		}
 		if not {
+			# You need to do mk pull before running mk install
+			if(! pm/pull $PKGNAME){
+				test -e root.tgz || fail $PKGNAME: pull failed
+			}
 			# Install all the dependencies
 			for (i in `{cat dep}) {
 				if (! grep $i $ROOT^/contrib/packages/installed >[2=1] >/dev/null) {