[PC-BSD Commits] r8012 - pcbsd/current/src-sh/pbi-manager

svn at pcbsd.org svn at pcbsd.org
Wed Nov 10 10:06:39 PST 2010


Author: kris
Date: 2010-11-10 10:06:39 -0800 (Wed, 10 Nov 2010)
New Revision: 8012

Modified:
   pcbsd/current/src-sh/pbi-manager/pbi-manager
Log:

Added small check to ensure we don't try to merge files which may have been just removed



Modified: pcbsd/current/src-sh/pbi-manager/pbi-manager
===================================================================
--- pcbsd/current/src-sh/pbi-manager/pbi-manager	2010-11-10 18:04:36 UTC (rev 8011)
+++ pcbsd/current/src-sh/pbi-manager/pbi-manager	2010-11-10 18:06:39 UTC (rev 8012)
@@ -1624,6 +1624,9 @@
 		hash="`echo $hl | sed 's/^.*::://g'`"
 		tfile="${file}:::${hash}"
 		
+		# Make sure the target file hasnt been removed
+		if [ ! -e "${1}/${file}" ] ; then continue ; fi
+
 		# We dont need no stinking sym-links
 		if [ -h "${1}/${file}" ] ; then continue ; fi
 



More information about the Commits mailing list