Commit 21e6754b authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Fix regex for -s option, so that you can do interconnect-utahddc:eth0.

parent f2e9e634
#!/usr/bin/perl -T #!/usr/bin/perl -T
# #
# Copyright (c) 2000-2013 University of Utah and the Flux Group. # Copyright (c) 2000-2014 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -148,7 +148,7 @@ if (!$opt{p} && !$opt{s}) { ...@@ -148,7 +148,7 @@ if (!$opt{p} && !$opt{s}) {
my @passedPorts = (); my @passedPorts = ();
foreach my $arg (@ARGV) { foreach my $arg (@ARGV) {
if ($opt{s}) { if ($opt{s}) {
if ($arg =~ /^([-\w\.\/]+)$/) { if ($arg =~ /^([-\w\.\/:]+)$/) {
$arg = $1; $arg = $1;
} }
else { else {
...@@ -228,7 +228,14 @@ if ($opt{s}) { ...@@ -228,7 +228,14 @@ if ($opt{s}) {
foreach my $port (@passedPorts) { foreach my $port (@passedPorts) {
if ($port =~ /^[^.]+\.\d+\/\d+$/) { if ($port =~ /^[^.]+\.\d+\/\d+$/) {
push @ports, convertPortFromString($port); push @ports, convertPortFromString($port);
} else { }
elsif ($port =~ /^[^:]+:\d+\.\d+$/) {
push @ports, convertPortFromString($port);
}
elsif ($port =~ /^[^:]+:\w+$/) {
push @ports, convertPortFromString($port);
}
else {
print "'$port' not in correct switch.port syntax, ignoring\n"; print "'$port' not in correct switch.port syntax, ignoring\n";
} }
} }
......
Supports Markdown
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