diff options
| author | Richard Jones <rjones@redhat.com> | 2010-01-05 23:04:57 +0000 |
|---|---|---|
| committer | Richard Jones <rjones@redhat.com> | 2010-01-05 23:04:57 +0000 |
| commit | a59dcdbd1b0a28c960e3792165a13f2daf4f6c35 (patch) | |
| tree | b433d007b54aa91fe43fe3eac4e3f5f23a55d890 | |
| parent | 5e180db9eefcd6b459b805c2215ba4d174e4eb83 (diff) | |
| download | libguestfs-a59dcdbd1b0a28c960e3792165a13f2daf4f6c35.tar.gz libguestfs-a59dcdbd1b0a28c960e3792165a13f2daf4f6c35.tar.xz libguestfs-a59dcdbd1b0a28c960e3792165a13f2daf4f6c35.zip | |
inspector: Make RPM application data more specific (RHBZ#552718).
List applications with epoch, release and arch data.
If epoch is 0, don't store this as an empty string, but as
undefined, and don't output empty <epoch/> element in the XML.
| -rwxr-xr-x | inspector/virt-inspector | 3 | ||||
| -rw-r--r-- | perl/lib/Sys/Guestfs/Lib.pm | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/inspector/virt-inspector b/inspector/virt-inspector index d0005101..cb892c06 100755 --- a/inspector/virt-inspector +++ b/inspector/virt-inspector @@ -519,7 +519,10 @@ sub output_xml_os foreach (@apps) { $xml->startTag("application"); $xml->dataElement("name", $_->{name}); + $xml->dataElement("epoch", $_->{epoch}) if defined $_->{epoch}; $xml->dataElement("version", $_->{version}); + $xml->dataElement("release", $_->{release}); + $xml->dataElement("arch", $_->{arch}); $xml->endTag("application"); } $xml->endTag("applications"); diff --git a/perl/lib/Sys/Guestfs/Lib.pm b/perl/lib/Sys/Guestfs/Lib.pm index c97fae38..49c08b39 100644 --- a/perl/lib/Sys/Guestfs/Lib.pm +++ b/perl/lib/Sys/Guestfs/Lib.pm @@ -1426,7 +1426,7 @@ sub _check_for_applications foreach (@lines) { if (m/^(.*) (.*) (.*) (.*) (.*)$/) { my $epoch = $2; - $epoch = "" if $epoch eq "(none)"; + undef $epoch if $epoch eq "(none)"; my $app = { name => $1, epoch => $epoch, |