[PC-BSD Commits] r18818 - pcbsd/current/src-sh/pc-metapkgmanager

[svn at pcbsd.org]

Author: kris
Date: 2012-09-04 16:42:03 +0000 (Tue, 04 Sep 2012)
New Revision: 18818

Modified:
   pcbsd/current/src-sh/pc-metapkgmanager/pc-metapkgmanager
Log:

Fix a bug installing meta-pkgs into a jail / chroot, make sure
we check the correct directory for existing packages



Modified: pcbsd/current/src-sh/pc-metapkgmanager/pc-metapkgmanager
===================================================================
--- pcbsd/current/src-sh/pc-metapkgmanager/pc-metapkgmanager	2012-09-04 16:39:11 UTC (rev 18817)
+++ pcbsd/current/src-sh/pc-metapkgmanager/pc-metapkgmanager	2012-09-04 16:42:03 UTC (rev 18818)
@@ -738,6 +738,7 @@
   do
     if [ ! -e "${DEPDIR}/${mPkg}.deps" ] ; then
        echo "Warning: No dependancy file for ${mPkg}!"
+       echo "Warning: No dependancy file for ${mPkg}!" >>${LOGFILE}
        continue
     fi
     get_pkg_deps "$mPkg"
@@ -754,7 +755,7 @@
   PKGCOUNT=0
   while read line
   do
-     if [ -d "/var/db/pkg/$line" -a "$_strip" = "YES" ] ; then continue ; fi
+     if [ -d "${_chroot}/var/db/pkg/$line" -a "$_strip" = "YES" ] ; then continue ; fi
      PKGLIST="${PKGLIST} ${line}"
      PKGCOUNT=`expr ${PKGCOUNT} + 1`
   done < /tmp/.pc-meta-sort.$$