From e1f148d1d139f2c144d151972a68d7c3761250d4 Mon Sep 17 00:00:00 2001
From: "preed%mozilla.com" <preed%mozilla.com>
Date: Fri, 9 Feb 2007 02:19:18 +0000
Subject: [PATCH] Bug 369801: Tinderboxen should output what config file
 they're using; let's see how this breaks the build farm. r=rhelmer

---
 tools/tinderbox/build-seamonkey-util.pl | 29 ++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/tools/tinderbox/build-seamonkey-util.pl b/tools/tinderbox/build-seamonkey-util.pl
index 831fdec3728..2125931b11a 100644
--- a/tools/tinderbox/build-seamonkey-util.pl
+++ b/tools/tinderbox/build-seamonkey-util.pl
@@ -24,7 +24,7 @@ use Config;         # for $Config{sig_name} and $Config{sig_num}
 use File::Find ();
 use File::Copy;
 
-$::UtilsVersion = '$Revision: 1.350 $ ';
+$::UtilsVersion = '$Revision: 1.351 $ ';
 
 package TinderUtils;
 
@@ -1473,6 +1473,33 @@ sub PrintEnv {
         print_log "$key=$ENV{$key}\n";
     }
 
+    # If we're on auto-update, print out the version/branch of the configs
+    # we're using to do this build.
+    if (defined($Settings::TboxBuildConfigDir)) {
+        print_log "-->Tinderbox Config Info<--------------------------\n";
+        my $confDir = $Settings::TboxBuildConfigDir;
+        if (not(-d "$confDir/CVS")) {
+            print_log '--config-cvsup-dir is set, but refers to an invalid ' .
+             "(not-CVS) directory\n";
+        } else {
+            my $cwd = get_system_cwd();
+            if (chdir($confDir)) {
+                my $status = run_shell_command_with_timeout('cvs stat', 
+                 $co_default_timeout); 
+
+                if ($status->{'exit_value'} != 0) {
+                    print_log "cvs stat of configs in $confDir FAILED\n";
+                }
+                
+                chdir($cwd) or die "Couldn't find my way back: $!\n";
+            } else {
+                print_log "chdir() to $confDir FAILED\n";
+            }
+        }
+
+        print_log "-->END Tinderbox Configuration Information<--------------\n";
+    }
+
     # Print out mozconfig if found.
     if (defined $ENV{MOZCONFIG} and -e $ENV{MOZCONFIG}) {
         print_log "-->mozconfig<----------------------------------------\n";