From owner-svn-src-user@FreeBSD.ORG  Thu May 15 16:22:10 2014
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1D6BE122;
 Thu, 15 May 2014 16:22:10 +0000 (UTC)
Received: from svn.freebsd.org (svn.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 0A31F289F;
 Thu, 15 May 2014 16:22:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4FGM9Xl077327;
 Thu, 15 May 2014 16:22:09 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4FGM9nR077326;
 Thu, 15 May 2014 16:22:09 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201405151622.s4FGM9nR077326@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Thu, 15 May 2014 16:22:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r266154 - user/des/tinderbox
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 May 2014 16:22:10 -0000

Author: des
Date: Thu May 15 16:22:09 2014
New Revision: 266154
URL: http://svnweb.freebsd.org/changeset/base/266154

Log:
  Factor out common code for the revert and update commands.

Modified:
  user/des/tinderbox/tinderbox.pl

Modified: user/des/tinderbox/tinderbox.pl
==============================================================================
--- user/des/tinderbox/tinderbox.pl	Thu May 15 16:17:21 2014	(r266153)
+++ user/des/tinderbox/tinderbox.pl	Thu May 15 16:22:09 2014	(r266154)
@@ -621,6 +621,10 @@ MAIN:{
     if ($cmds{'revert'} || $cmds{'version'} || $cmds{'update'}) {
 	$svncmd = [grep({ -x } @svncmds)]->[0]
 	    or error("unable to locate svn binary");
+	if (-d "$srcdir/.svn") {
+	    spawn($svncmd, "upgrade", $srcdir);
+	    spawn($svncmd, "cleanup", $srcdir);
+	}
     }
 
     # Revert sources
@@ -629,8 +633,6 @@ MAIN:{
 	push(@svnargs, "--quiet")
 	    unless ($verbose);
 	logstage("reverting $srcdir");
-	spawn($svncmd, @svnargs, "upgrade", $srcdir);
-	spawn($svncmd, @svnargs, "cleanup", $srcdir);
 	spawn($svncmd, @svnargs, "revert", "-R", $srcdir)
 	    or error("unable to revert the source tree");
 	# remove leftovers...  ugly!
@@ -674,8 +676,6 @@ MAIN:{
 	cd("$sandbox");
 	for (0..$svnattempts) {
 	    if (-d "$srcdir/.svn") {
-		spawn($svncmd, "upgrade", $srcdir);
-		spawn($svncmd, "cleanup", $srcdir);
 		last if spawn($svncmd, @svnargs, "update", $srcdir);
 	    } else {
 		last if spawn($svncmd, @svnargs, "checkout", $svnbase, $srcdir);
@@ -685,6 +685,7 @@ MAIN:{
 	    my $delay = 30 * ($_ + 1);
 	    warning("sleeping $delay s and retrying...");
 	    sleep($delay);
+	    spawn($svncmd, "cleanup", $srcdir);
 	}
     }