mirror of
https://github.com/libvirt/libvirt.git
synced 2026-09-03 20:53:04 -05:00
tools: virsh: metadata: do not report error on missing metadata
Similarly to `desc` and `net-desc`, return an empty string if there is no metadata to be returned. https://issues.redhat.com/browse/RHEL-27172 Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
@@ -8933,8 +8933,14 @@ cmdMetadata(vshControl *ctl, const vshCmd *cmd)
|
||||
g_autofree char *data = NULL;
|
||||
/* get */
|
||||
if (!(data = virDomainGetMetadata(dom, VIR_DOMAIN_METADATA_ELEMENT,
|
||||
uri, flags)))
|
||||
return false;
|
||||
uri, flags))) {
|
||||
if (virGetLastErrorCode() == VIR_ERR_NO_DOMAIN_METADATA) {
|
||||
virResetLastError();
|
||||
data = g_strdup("");
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
vshPrint(ctl, "%s\n", data);
|
||||
}
|
||||
|
||||
@@ -604,8 +604,14 @@ cmdNetworkMetadata(vshControl *ctl, const vshCmd *cmd)
|
||||
|
||||
/* get */
|
||||
if (!(data = virNetworkGetMetadata(net, VIR_NETWORK_METADATA_ELEMENT,
|
||||
uri, flags)))
|
||||
return false;
|
||||
uri, flags))) {
|
||||
if (virGetLastErrorCode() == VIR_ERR_NO_NETWORK_METADATA) {
|
||||
virResetLastError();
|
||||
data = g_strdup("");
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
vshPrint(ctl, "%s\n", data);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user