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

[svn at pcbsd.org]

Author: kris
Date: 2010-12-21 12:37:02 -0800 (Tue, 21 Dec 2010)
New Revision: 8250

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

When patching, let the pbid program clean the hashdir



Modified: pcbsd/current/src-sh/pbi-manager/pbi-manager
===================================================================
--- pcbsd/current/src-sh/pbi-manager/pbi-manager	2010-12-21 20:24:55 UTC (rev 8249)
+++ pcbsd/current/src-sh/pbi-manager/pbi-manager	2010-12-21 20:37:02 UTC (rev 8250)
@@ -1712,6 +1712,9 @@
 	# Update the hashdir
 	add_hashdir_trigger
 
+	# Mark the hash-dir as dirty as well
+	touch "${PBI_DBDIRTYFILE}"
+
 	echo "Finished patching ${_pbilow}: $PBI_PATCHTARGET -> $PBI_PATCHVERSION"
 }
 
@@ -1768,10 +1771,6 @@
 			mv "${PBI_PATCHWRKDIR}/${_tFile}" "${PBI_PATCHWRKDIR}/${_tFile}.patch.$$"
 			cp "${PBI_PATCHWRKDIR}/${_tFile}.patch.$$" "${PBI_PATCHWRKDIR}/${_tFile}"
 			rm -f "${PBI_PATCHWRKDIR}/${_tFile}.patch.$$"
-
-			# See if if removing this file leaves any orphan 
-			# hardlinks
-			check_remove_hashfile_fuzzy "${PBI_HASHDIR}/${_tFile}"
         	fi
 		
 		# Now do the patching
@@ -3287,16 +3286,6 @@
 	pbi_clean_emptyhdirs
 }
 
-# Check a fuzzy file(s) to see if it needs to be removed
-check_remove_hashfile_fuzzy()
-{
-	# Check if these files can be removed 
-	for _fch in `ls ${1}*`
-	do
-		check_remove_hashfile "${_fch}"
-	done
-}
-
 # Check if this hash-file is ready to be removed from the hash-dir
 check_remove_hashfile() {
 	tfile="${PBI_HASHDIR}/${1}"