From 057d549411208355071f561f532663b3873df64c Mon Sep 17 00:00:00 2001
From: "kestes%walrus.com" <kestes%walrus.com>
Date: Tue, 8 Jun 2004 00:12:16 +0000
Subject: [PATCH] change the name of the TinderConfig variable which
 corresponds to P4PORT so thatit matches the env name.

---
 webtools/tinderbox2/src/lib/TinderDB/VC_Perforce.pm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/webtools/tinderbox2/src/lib/TinderDB/VC_Perforce.pm b/webtools/tinderbox2/src/lib/TinderDB/VC_Perforce.pm
index 92c00c17c83f..c24c76f9e9c2 100755
--- a/webtools/tinderbox2/src/lib/TinderDB/VC_Perforce.pm
+++ b/webtools/tinderbox2/src/lib/TinderDB/VC_Perforce.pm
@@ -75,8 +75,8 @@
 # Contributor(s): 
 
 
-# $Revision: 1.22 $ 
-# $Date: 2004/06/07 22:54:34 $ 
+# $Revision: 1.23 $ 
+# $Date: 2004/06/08 00:12:16 $ 
 # $Author: kestes%walrus.com $ 
 # $Source: /home/hwine/cvs_conversion/cvsroot/mozilla/webtools/tinderbox2/src/lib/TinderDB/VC_Perforce.pm,v $ 
 # $Name:  $ 
@@ -156,7 +156,7 @@ use Utils;
 use VCDisplay;
 
 
-$VERSION = ( qw $Revision: 1.22 $ )[1];
+$VERSION = ( qw $Revision: 1.23 $ )[1];
 
 @ISA = qw(TinderDB::BasicTxtDB);
 
@@ -173,7 +173,11 @@ $VC_BUGNUM_REGEXP = $TinderConfig::VC_BUGNUM_REGEXP ||
 $NOTICE= TinderDB::Notice->new();
 $DEBUG = 1;
 
-$ENV{'P4PORT'} = $TinderConfig::PERFORCE_PORT || 1666;
+$ENV{'P4PORT'} = (
+                  $TinderConfig::P4PORT || 
+                  $ENV{'P4PORT'} || 
+                  'perforce:1666'
+                  );
 
 
 # return a string of the whole Database in a visually useful form.