From owner-svn-src-head@freebsd.org  Tue Jul 21 03:18:54 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5AD799A6359;
 Tue, 21 Jul 2015 03:18:54 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4C413682;
 Tue, 21 Jul 2015 03:18:54 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6L3Is4V009698;
 Tue, 21 Jul 2015 03:18:54 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6L3IsjR009697;
 Tue, 21 Jul 2015 03:18:54 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201507210318.t6L3IsjR009697@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 21 Jul 2015 03:18:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r285733 - head/release/tools
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jul 2015 03:18:54 -0000

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