svn commit: r285733 - head/release/tools

[Glen Barber]

Author: gjb
Date: Tue Jul 21 03:18:53 2015
New Revision: 285733
URL: https://svnweb.freebsd.org/changeset/base/285733

Log:
  Fix an out-of-order execution issue regarding pkg(8):
  - pkg(8) cannot be removed before subsequent reinvocations
  - The PKG_CACHEDIR cannot be cleaned after the repo*.sqlite
    has been removed
  - pkg(8) cannot be removed as a precursor to any of the other
    steps involved here
  
  MFC after:	3 days
  X-MFC-With:	r285722
  X-MFC-Before:	10.2-{BETA3,RC1} (whichever happens next)
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/tools/vagrant.conf

Modified: head/release/tools/vagrant.conf
==============================================================================
--- head/release/tools/vagrant.conf	Tue Jul 21 00:33:15 2015	(r285732)
+++ head/release/tools/vagrant.conf	Tue Jul 21 03:18:53 2015	(r285733)
@@ -15,9 +15,9 @@ vagrant_common () {
 	# catalogue and install or update pkg when the instance first
 	# launches, so these files would just be replaced anyway; removing
 	# them from the image allows it to boot faster.
+	env ASSUME_ALWAYS_YES=yes pkg -c ${DESTDIR} clean -y -a
 	env ASSUME_ALWAYS_YES=yes pkg -c ${DESTDIR} delete -f -y pkg
 	rm ${DESTDIR}/var/db/pkg/repo-*.sqlite
-	env ASSUME_ALWAYS_YES=yes pkg -c ${DESTDIR} clean -y -a
 
 	# Vagrant instances use DHCP to get their network configuration.
 	echo 'ifconfig_DEFAULT="SYNCDHCP"' >> ${DESTDIR}/etc/rc.conf