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

[svn at pcbsd.org]

Author: kris
Date: 2011-11-30 11:33:48 -0800 (Wed, 30 Nov 2011)
New Revision: 14085

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

Make sure we only cleanup a chroot if the user didn't specify to not so do



Modified: pcbsd/current/src-sh/pbi-manager/pbi-manager
===================================================================
--- pcbsd/current/src-sh/pbi-manager/pbi-manager	2011-11-30 19:25:10 UTC (rev 14084)
+++ pcbsd/current/src-sh/pbi-manager/pbi-manager	2011-11-30 19:33:48 UTC (rev 14085)
@@ -6100,6 +6100,8 @@
 	umount -f ${PBI_CHROOTDIR}/usr/ports >/dev/null 2>/dev/null
 	umount -f ${PBI_CHROOTDIR}/tmpfs >/dev/null 2>/dev/null
 	umount -f ${PBI_CHROOTDIR}/.ccache >/dev/null 2>/dev/null
+
+	if [ "${PBI_KEEPBUILDFILES}" = "YES" ] ; then return ; fi
 	rm -rf "${PBI_CHROOTDIR}" >/dev/null 2>/dev/null
 	chflags -R noschg ${PBI_CHROOTDIR} >/dev/null 2>/dev/null
 	rm -rf "${PBI_CHROOTDIR}" >/dev/null 2>/dev/null
@@ -6423,6 +6425,7 @@
 	   rm ${FETCH_TFILE}
 	fi
 	kill 0
+        chroot_make_cleanup
 	rm_tmpdir
 	exit 0
 }