[sos-devel] [PATCH v2] sosreport: Accept commas, period and alphas in the case id
Bryn M. Reeves
bmr at redhat.com
Fri Sep 12 10:02:23 UTC 2014
On Tue, Aug 19, 2014 at 04:06:27PM +0530, Aruna Balakrishnaiah wrote:
> sosreport does not accept commas, period and alphas in the case
> id, the patch fixes the same.
>
> Change the ticket number field to case id as it now accepts
> alpha numerals as well.
>
> Signed-off-by: Aruna Balakrishnaiah <aruna at linux.vnet.ibm.com>
> ---
> Changes from v1:
> Update documentation
>
> man/en/sosreport.1 | 6 +++---
> sos/policies/__init__.py | 20 ++++++++++----------
> sos/sosreport.py | 20 ++++++++++----------
> 3 files changed, 23 insertions(+), 23 deletions(-)
This patch does not apply to the current sos tree:
$ git apply --index /tmp/p
error: patch failed: man/en/sosreport.1:9
error: man/en/sosreport.1: patch does not apply
error: patch failed: sos/policies/__init__.py:188
error: sos/policies/__init__.py: patch does not apply
error: patch failed: sos/sosreport.py:216
error: sos/sosreport.py: patch does not apply
Looking at the failure in man/en/sosreport.1 it's failing because
the patch was made against a version that does not document the
--compression-type option:
[-a|--alloptions] [-v|--verbose]\fR
[--report] [--config-file conf] [--batch]\fR
[--build] [--name name] [--ticket-number number]
[--debug] [--tmp-dir directory]\fR
[-z|--compression-type method]\fR <<<<<<
vs:
[--report] [--config-file conf] [--batch]\fR
- [--build] [--name name] [--ticket-number number]
+ [--build] [--name name] [--case-id id]
[--debug] [--tmp-dir directory]\fR
[--help]\fR
When submitting patches you need to create them against an
up-to-date tree. The compression type change to the man page was
made back in early July:
commit cea5ebfbeab7d486879b4eb10e6d8b855144f47b
Author: Bryn M. Reeves <bmr at redhat.com>
Date: Thu Jul 10 19:19:45 2014 +0100
[docs] document -z, --compression-type in sosreport(1)
Signed-off-by: Bryn M. Reeves <bmr at redhat.com>
And there are now numerous other changes in other parts of the
tree.
I can fix this up but we are currently focused on getting 3.2
out and I probably won't have time until after the release.
If you can re-diff your patches against a current sos tree I'll
try to get them merged sooner.
Regards,
Bryn.
More information about the sos-devel
mailing list