Commit d970b592 authored by Leigh Stoller's avatar Leigh Stoller

Fix for imagevalidate errors on brand new "system" images. This closes

issue #366.

System images that are not released yet are stored over in /proj
until released. Imagevalidate (and other utilities) need to look
there for the image file(s) not /usr/testbed.
parent da9568e8
......@@ -2865,6 +2865,15 @@ sub FullImagePath($)
my $path = $self->path();
my $vers = $self->version();
my $name = $self->imagename();
#
# Watch for an unreleased system image; in that case we want to
# target that unreleased file in /proj. So we ignore the path in
# the DB and construct the /proj path instead.
#
if ($self->IsSystemImage() && !$self->released()) {
$path = $self->SaveDir();
}
if ($self->IsDirPath()) {
return $path . $name . ".ndz" . ($vers ? ":$vers" : "");
......@@ -2878,6 +2887,15 @@ sub DeltaImagePath($)
my $vers = $self->version();
my $name = $self->imagename();
#
# Watch for an unreleased system image; in that case we want to
# target that unreleased file in /proj. So we ignore the path in
# the DB and construct the /proj path instead.
#
if ($self->IsSystemImage() && !$self->released()) {
$path = $self->SaveDir();
}
if ($self->IsDirPath()) {
return $path . $name . ".ddz" . ($vers ? ":$vers" : "");
}
......
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