Skip to content

GitLab

Commit e6934d6c authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files
Options

Minor tweaks to deal with slots that defined but set to ''

parent 7a872e3d
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 7 deletions
utils/dumpdescriptor.in
View file @ e6934d6c
...@@ -106,8 +106,9 @@ sub DumpImage($) ...@@ -106,8 +106,9 @@ sub DumpImage($)
$xmlfields{"loadpart"} = $image->loadpart(); $xmlfields{"loadpart"} = $image->loadpart();
$xmlfields{"global"} = $image->global(); $xmlfields{"global"} = $image->global();
$xmlfields{"shared"} = $image->shared(); $xmlfields{"shared"} = $image->shared();
$xmlfields{"path"} = $image->path(); $xmlfields{"path"} = $image->path()
#$xmlfields{"mbr_version"} = $image->mbr_version(); if (defined($image->path()) && $image->path() ne "");
$xmlfields{"mbr_version"} = $image->mbr_version();
sub MapOS($) { sub MapOS($) {
my ($osid) = @_; my ($osid) = @_;
...@@ -135,9 +136,11 @@ sub DumpImage($) ...@@ -135,9 +136,11 @@ sub DumpImage($)
fatal("Could not find osid for $image"); fatal("Could not find osid for $image");
} }
$xmlfields{"OS"} = $osinfo->OS(); $xmlfields{"OS"} = $osinfo->OS();
$xmlfields{"version"} = $osinfo->version(); $xmlfields{"version"} = $osinfo->version()
if (defined($osinfo->version()) && $osinfo->version() ne "");
$xmlfields{"op_mode"} = $osinfo->op_mode(); $xmlfields{"op_mode"} = $osinfo->op_mode();
$xmlfields{"osfeatures"} = $osinfo->osfeatures(); $xmlfields{"osfeatures"} = $osinfo->osfeatures()
if (defined($osinfo->osfeatures()) && $osinfo->osfeatures() ne "");
$xmlfields{"reboot_waittime"} = $osinfo->reboot_waittime() $xmlfields{"reboot_waittime"} = $osinfo->reboot_waittime()
if (defined($osinfo->reboot_waittime())); if (defined($osinfo->reboot_waittime()));
} }
...@@ -165,13 +168,15 @@ sub DumpOS($) ...@@ -165,13 +168,15 @@ sub DumpOS($)
$xmlfields{"osname"} = $osinfo->osname(); $xmlfields{"osname"} = $osinfo->osname();
$xmlfields{"pid"} = $osinfo->pid(); $xmlfields{"pid"} = $osinfo->pid();
$xmlfields{"OS"} = $osinfo->OS(); $xmlfields{"OS"} = $osinfo->OS();
$xmlfields{"version"} = $osinfo->version(); $xmlfields{"version"} = $osinfo->version()
if (defined($osinfo->version()) && $osinfo->version() ne "");
$xmlfields{"path"} = $osinfo->path() $xmlfields{"path"} = $osinfo->path()
if (defined($osinfo->path())); if (defined($osinfo->path()) && $osinfo->path() ne "");
$xmlfields{"magic"} = $osinfo->magic() $xmlfields{"magic"} = $osinfo->magic()
if (defined($osinfo->magic())); if (defined($osinfo->magic()));
$xmlfields{"op_mode"} = $osinfo->op_mode(); $xmlfields{"op_mode"} = $osinfo->op_mode();
$xmlfields{"features"} = $osinfo->osfeatures(); $xmlfields{"features"} = $osinfo->osfeatures()
if (defined($osinfo->osfeatures()) && $osinfo->osfeatures() ne "");
$xmlfields{"shared"} = $osinfo->shared(); $xmlfields{"shared"} = $osinfo->shared();
$xmlfields{"mustclean"} = $osinfo->mustclean(); $xmlfields{"mustclean"} = $osinfo->mustclean();
$xmlfields{"reboot_waittime"} = $osinfo->reboot_waittime() $xmlfields{"reboot_waittime"} = $osinfo->reboot_waittime()
......
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