Commit 983ddd06 authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Wrap previous change in check for MAINSITE, and only when running from

the main tree. This will prevent devel trees from running Rob's
alternate version.
parent 3218c37f
......@@ -17,6 +17,7 @@ use lib '@prefix@/lib';
my $TESTMODE = @TESTMODE@;
my $ELABINELAB = @ELABINELAB@;
my $NOSTACKMIB = @NOSTACKMIB@;
my $MAINSITE = @TBMAINSITE@;
my $TB = '@prefix@';
use libdb;
......@@ -449,7 +450,7 @@ if ($pid && $eid) {
#
# See if we use the alternate version of snmpit from Rob.
#
if (! $opt{Z}) {
if ($MAINSITE && $TB eq "/usr/testbed" && !$opt{Z}) {
my $group = (defined($experiment) ? $experiment->GetGroup() : undef);
$EmulabFeatures::verbose = 0;
my $newsnmpit =
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment