Commit b96efc7b authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Minor fix to imageid regex.

parent 11887440
...@@ -398,7 +398,8 @@ if (scalar(@tmp) && exists($tmp[0]->{"WHAT"})) { ...@@ -398,7 +398,8 @@ if (scalar(@tmp) && exists($tmp[0]->{"WHAT"})) {
fatal("vnode $vnodeid in reloading, but got no loadinfo!"); fatal("vnode $vnodeid in reloading, but got no loadinfo!");
} }
else { else {
if ($tmp[0]->{"IMAGEID"} =~ /^([-\d\w]+),([-\d\w]+),([-\d\w]+)$/) { if ($tmp[0]->{"IMAGEID"} =~
/^([-\d\w]+),([-\d\w]+),([-\d\w\.]+)$/) {
$vnconfig{"reloadinfo"} = $tmp[0]; $vnconfig{"reloadinfo"} = $tmp[0];
$vnconfig{"image"} = "$1-$2-$3"; $vnconfig{"image"} = "$1-$2-$3";
} }
......
...@@ -484,7 +484,8 @@ sub downloadImage($$$$) { ...@@ -484,7 +484,8 @@ sub downloadImage($$$$) {
if ($reload_args_ref->{"SERVER"} =~ /^(\d+\.\d+\.\d+\.\d+)$/) { if ($reload_args_ref->{"SERVER"} =~ /^(\d+\.\d+\.\d+\.\d+)$/) {
$server = $1; $server = $1;
} }
if ($reload_args_ref->{"IMAGEID"} =~ /^([-\d\w]+),([-\d\w]+),([-\d\w]+)$/) { if ($reload_args_ref->{"IMAGEID"} =~
/^([-\d\w]+),([-\d\w]+),([-\d\w\.]+)$/) {
$imageid = "$1/$3"; $imageid = "$1/$3";
} }
if (SHAREDHOST()) { if (SHAREDHOST()) {
......
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