From owner-svn-src-user@FreeBSD.ORG Sat Sep 21 22:12:10 2013 Return-Path: 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 352E86FF; Sat, 21 Sep 2013 22:12:10 +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 142BB2B8D; Sat, 21 Sep 2013 22:12:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8LMC9i9006269; Sat, 21 Sep 2013 22:12:09 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8LMC9nc006261; Sat, 21 Sep 2013 22:12:09 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201309212212.r8LMC9nc006261@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Sat, 21 Sep 2013 22:12:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r255772 - 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 " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Sep 2013 22:12:10 -0000 Author: des Date: Sat Sep 21 22:12:09 2013 New Revision: 255772 URL: http://svnweb.freebsd.org/changeset/base/255772 Log: It makes a lot more sense to read site.rc after the config than before it. This allows site.rc to override existing settings, e.g. disable email reports by clearing RECIPIENTS. Also bump version and copyright. Modified: user/des/tinderbox/tbmaster.1 user/des/tinderbox/tbmaster.pl user/des/tinderbox/tinderbox.pl Modified: user/des/tinderbox/tbmaster.1 ============================================================================== --- user/des/tinderbox/tbmaster.1 Sat Sep 21 22:11:09 2013 (r255771) +++ user/des/tinderbox/tbmaster.1 Sat Sep 21 22:12:09 2013 (r255772) @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2003-2012 Dag-Erling Smørgrav +.\" Copyright (c) 2003-2013 Dag-Erling Smørgrav .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 18, 2012 +.Dd September 22, 2013 .Dt TBMASTER 1 .Os .Sh NAME @@ -94,8 +94,9 @@ attempts to read .Pa default.rc and .Pa site.rc -before reading the actual configuration file; thus, these files may be -used to specify default values shared by multiple configurations. +before and after the actual configuration file, respectively; thus, +they can be used to specify default values shared by multiple +configurations. .Pp The configuration consists of a list of single- or multiple-value variable assignments: Modified: user/des/tinderbox/tbmaster.pl ============================================================================== --- user/des/tinderbox/tbmaster.pl Sat Sep 21 22:11:09 2013 (r255771) +++ user/des/tinderbox/tbmaster.pl Sat Sep 21 22:12:09 2013 (r255772) @@ -1,6 +1,6 @@ #!/usr/bin/perl -Tw #- -# Copyright (c) 2003-2012 Dag-Erling Smørgrav +# Copyright (c) 2003-2013 Dag-Erling Smørgrav # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -34,8 +34,8 @@ use POSIX; use Getopt::Long; use Storable qw(dclone); -my $VERSION = "2.10"; -my $COPYRIGHT = "Copyright (c) 2003-2012 Dag-Erling Smørgrav. " . +my $VERSION = "2.11"; +my $COPYRIGHT = "Copyright (c) 2003-2013 Dag-Erling Smørgrav. " . "All rights reserved."; my $BACKLOG = 8; @@ -518,9 +518,9 @@ sub tbmaster($) { clearconf(); readconf('default.rc'); - readconf('site.rc'); readconf("$config.rc") or die("$config.rc: $!\n"); + readconf('site.rc'); $CONFIG{'CONFIG'} = $config; $CONFIG{'ETCDIR'} = $etcdir; Modified: user/des/tinderbox/tinderbox.pl ============================================================================== --- user/des/tinderbox/tinderbox.pl Sat Sep 21 22:11:09 2013 (r255771) +++ user/des/tinderbox/tinderbox.pl Sat Sep 21 22:12:09 2013 (r255772) @@ -1,6 +1,6 @@ #!/usr/bin/perl -Tw #- -# Copyright (c) 2003-2012 Dag-Erling Smørgrav +# Copyright (c) 2003-2013 Dag-Erling Smørgrav # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -33,7 +33,7 @@ use Fcntl qw(:DEFAULT :flock); use POSIX; use Getopt::Long; -my $VERSION = "2.10"; +my $VERSION = "2.11"; my $COPYRIGHT = "Copyright (c) 2003-2012 Dag-Erling Smørgrav. " . "All rights reserved.";