[PC-BSD Commits] r20263 - pcbsd/branches/9.1/src-sh/pc-metapkgmanager

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


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

Modified:
   pcbsd/branches/9.1/src-sh/pc-metapkgmanager/pc-metapkgmanager
Log:

MFC fix for blank lines in pkg files



Modified: pcbsd/branches/9.1/src-sh/pc-metapkgmanager/pc-metapkgmanager
===================================================================
--- pcbsd/branches/9.1/src-sh/pc-metapkgmanager/pc-metapkgmanager	2012-11-19 23:11:19 UTC (rev 20262)
+++ pcbsd/branches/9.1/src-sh/pc-metapkgmanager/pc-metapkgmanager	2012-11-19 23:11:32 UTC (rev 20263)
@@ -236,6 +236,7 @@
 		_iList=""
 		while read pkg
 		do
+			if [ -z "$pkg" ] ; then continue ; fi
 			${_chrootcmd} pkg_info $pkg >/dev/null 2>/dev/null
 			if [ "$?" != "0" ] ; then continue; fi
 			_iList="${_iList}${pkg}:"
@@ -407,6 +408,7 @@
 	# Now query pkg_info to confirm each pkg is installed
 	while read pkg
 	do
+		if [ -z "$pkg" ] ; then continue ; fi
 		# See if the pkg is installed, without worrying about
 		# version numbers. This means a meta-pkg shows as
 		# installed even if the user manually updated
@@ -750,6 +752,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`
@@ -759,6 +762,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