svn commit: r255772 - user/des/tinderbox

[Dag-Erling Smørgrav]

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.";