From 522bf11452bebf1126661339b0d0773a6922bf1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= <des@FreeBSD.org>
Date: Fri, 23 Jan 2004 23:06:14 +0000
Subject: [PATCH] Add support for tinderbox.pl's --cvsup and --repository
 options. Sort %CONFIG.

---
 tools/tools/tinderbox/tbmaster.pl | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/tools/tools/tinderbox/tbmaster.pl b/tools/tools/tinderbox/tbmaster.pl
index ac685066b54..246bbb96aff 100644
--- a/tools/tools/tinderbox/tbmaster.pl
+++ b/tools/tools/tinderbox/tbmaster.pl
@@ -44,20 +44,22 @@ my $dump;			# Dump configuration and exit
 my $etcdir;			# Configuration directory
 
 my %CONFIG = (
-    'COMMENT'	=> '',
     'BRANCHES'	=> [ 'CURRENT' ],
-    'PLATFORMS'	=> [ 'i386' ],
+    'COMMENT'	=> '',
+    'CVSUP'	=> '',
     'DATE'	=> '',
-    'SANDBOX'	=> '/tmp/tinderbox',
+    'ENV'	=> [],
     'HOSTNAME'	=> '',
     'LOGDIR'	=> '%%SANDBOX%%/logs',
-    'TARGETS'	=> [ 'update', 'world' ],
     'OPTIONS'	=> [],
     'PATCH'	=> '',
-    'ENV'	=> [],
-    'SENDER'	=> '',
+    'PLATFORMS'	=> [ 'i386' ],
     'RECIPIENT'	=> '',
+    'REPOSITORY'=> '',
+    'SANDBOX'	=> '/tmp/tinderbox',
+    'SENDER'	=> '',
     'SUBJECT'	=> 'Tinderbox failure on %%arch%%/%%machine%%',
+    'TARGETS'	=> [ 'update', 'world' ],
     'TINDERBOX'	=> '%%HOME%%/tinderbox',
 );
 
@@ -224,9 +226,13 @@ sub tinderbox($$$) {
     push(@args, "--hostname=" . expand('HOSTNAME'))
 	if ($CONFIG{'HOSTNAME'});
     push(@args, "--sandbox=" . expand('SANDBOX'));
-    push(@args, "--branch=$branch");
     push(@args, "--arch=$arch");
     push(@args, "--machine=$machine");
+    push(@args, "--cvsup=" . expand('CVSUP'))
+	if ($CONFIG{'CVSUP'});
+    push(@args, "--repository=" . expand('REPOSITORY'))
+	if ($CONFIG{'REPOSITORY'});
+    push(@args, "--branch=$branch");
     push(@args, "--date=" . expand('DATE'))
 	if ($CONFIG{'DATE'});
     push(@args, "--patch=" . expand('PATCH'))