From owner-svn-src-user@FreeBSD.ORG  Sat Sep 21 09:17:14 2013
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 ESMTP id EAD48CC0;
 Sat, 21 Sep 2013 09:17:14 +0000 (UTC) (envelope-from des@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id D8B6B2348;
 Sat, 21 Sep 2013 09:17:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8L9HEvq088233;
 Sat, 21 Sep 2013 09:17:14 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8L9HEPB088232;
 Sat, 21 Sep 2013 09:17:14 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201309210917.r8L9HEPB088232@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Sat, 21 Sep 2013 09:17:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r255758 - 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.14
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: Sat, 21 Sep 2013 09:17:15 -0000

Author: des
Date: Sat Sep 21 09:17:14 2013
New Revision: 255758
URL: http://svnweb.freebsd.org/changeset/base/255758

Log:
  %INITIAL_CONFIG contains arrayrefs, so we need to deep-clone it into
  %CONFIG; otherwise, modifying e.g. %CONFIG{ENV} will actually modify
  %INITIAL_CONFIG{ENV} and thereby contaminate the next job.

Modified:
  user/des/tinderbox/tbmaster.pl

Modified: user/des/tinderbox/tbmaster.pl
==============================================================================
--- user/des/tinderbox/tbmaster.pl	Sat Sep 21 04:11:51 2013	(r255757)
+++ user/des/tinderbox/tbmaster.pl	Sat Sep 21 09:17:14 2013	(r255758)
@@ -32,6 +32,7 @@ use strict;
 use Fcntl qw(:DEFAULT :flock);
 use POSIX;
 use Getopt::Long;
+use Storable qw(dclone);
 
 my $VERSION	= "2.10";
 my $COPYRIGHT	= "Copyright (c) 2003-2012 Dag-Erling Smørgrav. " .
@@ -147,7 +148,7 @@ sub expand($) {
 #
 sub clearconf() {
 
-    %CONFIG = %INITIAL_CONFIG;
+    %CONFIG = %{dclone(\%INITIAL_CONFIG)};
 }
 
 #