From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Mon, 10 Apr 2006 22:21:48 +0000 (+0000)
Subject: - fix for FC4 yum
X-Git-Tag: myplc-0_4-rc1~10
X-Git-Url: http://git.onelab.eu/?p=vserver-reference.git;a=commitdiff_plain;h=e3dedc5c1b8eb0a030bd03ec2f98708ad32b38cb

- fix for FC4 yum
- always try and download and record the package dependency so that we
  can be re-run
- skip blank lines to avoid segfaulting grep
---

diff --git a/system-packages.sh b/system-packages.sh
index 3147f54..57cd7f8 100755
--- a/system-packages.sh
+++ b/system-packages.sh
@@ -6,7 +6,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2004-2006 The Trustees of Princeton University
 #
-# $Id$
+# $Id: system-packages.sh,v 1.1 2006/04/05 20:32:28 mlhuang Exp $
 #
 
 export PATH=/sbin:/bin:/usr/sbin:/usr/bin
@@ -83,13 +83,11 @@ for slice in pl_netflow pl_conf ; do
 	    version=${version##*:}
 	    repository=${words[3]}
 
-	    if [ -f $rpms/$package-$version.$arch.rpm ] ; then
-		break
-	    fi
-
 	    baseurl=
 	    while read line ; do
-		if grep -q "^\[$repository\]" <<<$line ; then
+		if [ -z "$line" ] ; then
+		    continue
+		elif grep -q "^\[$repository\]" <<<$line ; then
 		    baseurl=$repository
 		elif [ "$baseurl" = "$repository" ] && grep -q "^baseurl=" <<<$line ; then
 		    eval $line
@@ -119,11 +117,12 @@ for slice in pl_netflow pl_conf ; do
 		    break
 		fi
 	    done <$vroot/etc/yum.conf
-	done < <(yum -c $vroot/etc/yum.conf --installroot=$vroot shell <<EOF
+	done < <((yum -c $vroot/etc/yum.conf --installroot=$vroot shell <<EOF
 install $packages
 transaction solve
 transaction list
 EOF
+	    ) | sed -ne '/^Installing:/,/^Transaction Summary/p' 
 	)
     else
         # This is pretty fucked up. Turn on verbose debugging and the