From owner-svn-src-user@FreeBSD.ORG  Fri May 16 13:27:32 2014
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 08EE27AD;
 Fri, 16 May 2014 13:27:32 +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 EAD802E4F;
 Fri, 16 May 2014 13:27:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4GDRVNK041133;
 Fri, 16 May 2014 13:27:31 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4GDRV90041132;
 Fri, 16 May 2014 13:27:31 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201405161327.s4GDRV90041132@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Fri, 16 May 2014 13:27:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r266218 - 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: Fri, 16 May 2014 13:27:32 -0000

Author: des
Date: Fri May 16 13:27:31 2014
New Revision: 266218
URL: http://svnweb.freebsd.org/changeset/base/266218

Log:
  Don't run svn upgrade / cleanup just for svn version.

Modified:
  user/des/tinderbox/tinderbox.pl

Modified: user/des/tinderbox/tinderbox.pl
==============================================================================
--- user/des/tinderbox/tinderbox.pl	Fri May 16 12:43:45 2014	(r266217)
+++ user/des/tinderbox/tinderbox.pl	Fri May 16 13:27:31 2014	(r266218)
@@ -621,10 +621,12 @@ 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);
-	}
+    }
+
+    # Upgrade and unlock the working copy
+    if (($cmds{'revert'} || $cmds{'update'}) && -d "$srcdir/.svn") {
+	spawn($svncmd, "upgrade", $srcdir);
+	spawn($svncmd, "cleanup", $srcdir);
     }
 
     # Revert sources