- just warn about missing packages, don't bail out

diff --git a/mkfedora b/mkfedora
index 7283f3d..a23e8d7 100755 (executable)
--- a/mkfedora
+++ b/mkfedora
@@ -13,7 +13,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2004-2006 The Trustees of Princeton University
 #
-# $Id: mkfedora,v 1.17 2006/07/17 21:25:42 mlhuang Exp $
+# $Id: mkfedora,v 1.18 2006/08/11 12:23:57 thierry Exp $
 #
 
 export PATH=/sbin:/bin:/usr/sbin:/usr/bin
@@ -200,12 +200,6 @@ mount -t tmpfs none $vroot/dev/shm
 mkdir -p $vroot/proc
 mount -t proc none $vroot/proc
 
-bailout ()
-{
-    cleanup
-    exit $1
-}
-
 cleanup ()
 {
     umount $vroot/proc
@@ -335,10 +329,11 @@ if [ ${#packages[*]} -gt 0 ] ; then
    echo "* Installing optional packages" "${packages[@]}" >&3
    yum -c $vroot/etc/yum.conf --installroot=$vroot -y $excludes \
          install "${packages[@]}"
-   for pkg in "${packages[@]}" ; do
-      echo "Checking installation of $pkg"
-      rpm --root $vroot -q "$pkg" || bailout 1
-   done
+   missing=$(rpm --root $vroot -q "${packages[@]}" | grep "not installed")
+   if [ -n "$missing" ] ; then
+       echo "* Warning: Missing packages"
+       cat <<<$missing
+   fi
 fi
 
 if [ ${#groups[*]} -gt 0 ] ; then