Commit 4e41c69e authored by Weibin Sun's avatar Weibin Sun
Browse files

Merge remote branch 'central/master' into postportmerge

parents b7bda72e f7e9b0dd
......@@ -2,6 +2,7 @@ package TraceUse;
use Time::HiRes qw( gettimeofday tv_interval );
use Data::Dumper;
use English;
BEGIN
{
......@@ -54,6 +55,7 @@ sub trace_use
'line' => $line,
'time' => $elapsed,
'module' => $mod_name,
'inc' => "@INC",
};
return;
......@@ -83,6 +85,7 @@ END
my $indent = ' ' x $pos;
$message .= "$indent$mod->{module}, line $mod->{line}";
$message .= sprintf(" (%lf)", $mod->{'time'}) if $mod->{time};
# $message .= " " . $mod->{inc};
warn "$message\n";
}
}
......
......@@ -917,7 +917,9 @@ COMMAND: foreach my $command (@commands) {
foreach my $vlanid (@vlans) {
my $vlan = $vlans{$vlanid};
if (!$vlan->link() || exists($newvlans{$vlan->link()})) {
if (!$vlan->link() ||
exists($newvlans{$vlan->link()}) ||
!exists($vlans{$vlan->link()})) {
push(@newvlans, $vlanid);
$newvlans{$vlanid} = $vlanid;
}
......
......@@ -927,7 +927,9 @@ COMMAND: foreach my $command (@commands) {
foreach my $vlanid (@vlans) {
my $vlan = $vlans{$vlanid};
if (!$vlan->link() || exists($newvlans{$vlan->link()})) {
if (!$vlan->link() ||
exists($newvlans{$vlan->link()}) ||
!exists($vlans{$vlan->link()})) {
push(@newvlans, $vlanid);
$newvlans{$vlanid} = $vlanid;
}
......
......@@ -274,7 +274,7 @@ else {
$errors["Max. Duration"] = "No or invalid time provided";
}
# The user can override autoswap timeout, but limit unless an admin.
if ($formfields["exp_idleswap_timeout"] > 24 * 5 && !ISADMIN()) {
if ($formfields["exp_autoswap_timeout"] > 24 * 5 && !ISADMIN()) {
$errors["Max. Duration"] = "5 days maximum - ".
"you must ask testbed operations for more";
}
......
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