Re: [libvirt] [PATCH] libvirt: virsh: Kill all uses of __FUNCTION__ in error messages
On 01.04.2015 14:46, Noella Ashu wrote:
The error output of snapshot-revert should be more friendly. There is
no
need to show up virDomainRevertToSnapshot to user. virError already includes
__FUNCTION__ information in a separate member of the struct, so repeating
it in the message is redundant and leads to situations where higher level
code ends up reporting the lower level name We correctly converted the
error output making it more succinct and user-friendly.
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1086726
---
src/libvirt-domain-snapshot.c | 30 +++----
src/libvirt-domain.c | 201 ++++++++++++++++++------------------------
2 files changed, 96 insertions(+), 135 deletions(-)
I'm having some difficulties applying this patch:
Applying: libvirt: virsh: Kill all uses of __FUNCTION__ in error messages
/home/zippy/work/libvirt/libvirt.git/.git/rebase-apply/patch:91: trailing whitespace.
virReportInvalidArg(stream, "%s",
/home/zippy/work/libvirt/libvirt.git/.git/rebase-apply/patch:105: trailing whitespace.
virReportInvalidArg(flags, "%s",
/home/zippy/work/libvirt/libvirt.git/.git/rebase-apply/patch:118: trailing whitespace.
virReportInvalidArg(flags, "%s",
/home/zippy/work/libvirt/libvirt.git/.git/rebase-apply/patch:233: trailing whitespace.
virReportInvalidArg(conn, "%s",
/home/zippy/work/libvirt/libvirt.git/.git/rebase-apply/patch:309: trailing whitespace.
virReportInvalidArg(nkeycodes, "%s",
error: patch failed: src/libvirt-domain.c:11284
error: src/libvirt-domain.c: patch does not apply
Patch failed at 0001 libvirt: virsh: Kill all uses of __FUNCTION__ in error messages
The copy of the patch that failed is found in:
/home/zippy/work/libvirt/libvirt.git/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Can you please rebase and resend? Oh, and don't forget to run 'make syntax-check
check' before sending a patch.
Michal