Commit 1ba99d21 authored by Leigh B Stoller's avatar Leigh B Stoller

Minor bug fix and show the version when printing image/os_info.

parent 51b968cc
......@@ -880,9 +880,10 @@ sub Stringify($)
my $pid = $self->pid();
my $imageid = $self->imageid();
my $version = $self->version();
my $imagename = $self->imagename();
return "[Image $imageid: $pid,$imagename]";
return "[Image $imageid:$version $pid,$imagename]";
}
#
......
......@@ -418,9 +418,10 @@ sub Stringify($)
my $pid = $self->pid();
my $osid = $self->osid();
my $vers = $self->vers();
my $osname = $self->osname();
return "[OS $osid: $pid,$osname]";
return "[OS $osid:$vers $pid,$osname]";
}
#
......
......@@ -233,7 +233,8 @@ if (defined($options{"i"})) {
$imagenames = $options{"i"};
foreach my $imagename (split /,/, $imagenames) {
my $version = 0;
# Default to current default if no version specified.
my $version = undef;
if ($imagename =~ /^([-\w\.\+]+)$/) {
$imagename = $1;
......
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