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

svn at pcbsd.org svn at pcbsd.org
Mon Nov 19 15:11:19 PST 2012


Author: kris
Date: 2012-11-19 23:11:19 +0000 (Mon, 19 Nov 2012)
New Revision: 20262

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

If we have a blank line in the pkg file, we can skip it



Modified: pcbsd/current/src-sh/pc-metapkgmanager/pc-metapkgmanager
===================================================================
--- pcbsd/current/src-sh/pc-metapkgmanager/pc-metapkgmanager	2012-11-19 22:51:05 UTC (rev 20261)
+++ pcbsd/current/src-sh/pc-metapkgmanager/pc-metapkgmanager	2012-11-19 23:11:19 UTC (rev 20262)
@@ -261,6 +261,7 @@
 		_iList=""
 		while read pkg
 		do
+			if [ -z "$pkg" ] ; then continue ; fi
 			${_chrootcmd} pkg info -e $pkg >/dev/null 2>/dev/null
 			if [ "$?" != "0" ] ; then continue; fi
 			_iList="${_iList}${pkg}:"
@@ -437,6 +438,7 @@
         fi
 	while read pkg
 	do
+		if [ -z "$pkg" ] ; then continue ; fi
 		pName=${pkg%-*}
 		case $'\n'$list$'\n' in
 			*$'\n'"$pName"$'\n'*) found=0 ;;
@@ -785,6 +787,7 @@
      PKGCOUNT=0
      while read line
      do
+	if [ -z "$line" ] ; then continue ; fi
         if [ -d "${_chroot}/var/db/pkg/$line" -a "$_strip" = "YES" ] ; then continue ; fi
         PKGLIST="${PKGLIST} ${line}"
         PKGCOUNT=`expr ${PKGCOUNT} + 1`
@@ -794,6 +797,7 @@
 
   while read mPkg
   do
+    if [ -z "$mPkg" ] ; then continue ; fi
     if [ ! -e "${DEPDIR}/${mPkg}.deps" ] ; then
        echo "Warning: No dependancy file for ${mPkg}!"
        echo "Warning: No dependancy file for ${mPkg}!" >>${LOGFILE}



More information about the Commits mailing list