| Message ID | 20220913093345.84370-1-zlang@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | common/rc: replace obsolescent egrep and fgrep | expand |
On Tue, 13 Sep 2022 17:33:45 +0800, Zorro Lang wrote: > Due to the change in grep project: > a95156247098 ("egrep, fgrep: now obsolete") > > some tests start to fail on latest Fedora system with grep-3.8-1.fc38 > or newer version, as: > > generic/447 70s ... egrep: warning: egrep is obsolescent; using grep -E > ... > @@ -1,4 +1,5 @@ > QA output created by 447 > +egrep: warning: egrep is obsolescent; using grep -E > ... > > So use grep -E and -F to instead of egrep and fgrep commands. > > Signed-off-by: Zorro Lang <zlang@kernel.org> > --- > common/rc | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/common/rc b/common/rc > index a25cbcd0..dee3965e 100644 > --- a/common/rc > +++ b/common/rc > @@ -30,6 +30,17 @@ dd() > fi > } > > +# The egrep and fgrep are obsolescent > +egrep() > +{ > + grep -E "$@" > +} > + > +fgrep() > +{ > + grep -F "$@" > +} > + > # Prints the md5 checksum of a given file > _md5_checksum() > { Nit: AFAICT there's only one fgrep caller, so just change that single case. With that fixed: Reviewed-by: David Disseldorp <ddiss@suse.de>
On Tue, Sep 13, 2022 at 02:27:51PM +0200, David Disseldorp wrote: > On Tue, 13 Sep 2022 17:33:45 +0800, Zorro Lang wrote: > > > Due to the change in grep project: > > a95156247098 ("egrep, fgrep: now obsolete") > > > > some tests start to fail on latest Fedora system with grep-3.8-1.fc38 > > or newer version, as: > > > > generic/447 70s ... egrep: warning: egrep is obsolescent; using grep -E > > ... > > @@ -1,4 +1,5 @@ > > QA output created by 447 > > +egrep: warning: egrep is obsolescent; using grep -E > > ... > > > > So use grep -E and -F to instead of egrep and fgrep commands. > > > > Signed-off-by: Zorro Lang <zlang@kernel.org> > > --- > > common/rc | 11 +++++++++++ > > 1 file changed, 11 insertions(+) > > > > diff --git a/common/rc b/common/rc > > index a25cbcd0..dee3965e 100644 > > --- a/common/rc > > +++ b/common/rc > > @@ -30,6 +30,17 @@ dd() > > fi > > } > > > > +# The egrep and fgrep are obsolescent > > +egrep() > > +{ > > + grep -E "$@" > > +} > > + > > +fgrep() > > +{ > > + grep -F "$@" > > +} > > + > > # Prints the md5 checksum of a given file > > _md5_checksum() > > { > > Nit: AFAICT there's only one fgrep caller, so just change that single > case. With that fixed: Thanks for reviewing! Yeah, I thought about that too. But then I thought a fgrep() might help later patches to avoid using fgrep command directly, so ... Thanks, Zorro > > Reviewed-by: David Disseldorp <ddiss@suse.de> >
On Tue, Sep 13, 2022 at 05:33:45PM +0800, Zorro Lang wrote: > Due to the change in grep project: > a95156247098 ("egrep, fgrep: now obsolete") > > some tests start to fail on latest Fedora system with grep-3.8-1.fc38 > or newer version, as: > > generic/447 70s ... egrep: warning: egrep is obsolescent; using grep -E > ... > @@ -1,4 +1,5 @@ > QA output created by 447 > +egrep: warning: egrep is obsolescent; using grep -E > ... > > So use grep -E and -F to instead of egrep and fgrep commands. > > Signed-off-by: Zorro Lang <zlang@kernel.org> > --- > common/rc | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/common/rc b/common/rc > index a25cbcd0..dee3965e 100644 > --- a/common/rc > +++ b/common/rc > @@ -30,6 +30,17 @@ dd() > fi > } > > +# The egrep and fgrep are obsolescent > +egrep() > +{ > + grep -E "$@" > +} > + > +fgrep() > +{ > + grep -F "$@" > +} Why not conditionally define these *only* if the system doesn't already have an egrep/fgrep binary? (Alternately I guess you could take Murphy's patch, since that's the proper fix according to the gnu grep maintainers...) --D > + > # Prints the md5 checksum of a given file > _md5_checksum() > { > -- > 2.31.1 >
On Wed, Sep 14, 2022 at 10:57:55AM -0700, Darrick J. Wong wrote: > On Tue, Sep 13, 2022 at 05:33:45PM +0800, Zorro Lang wrote: > > Due to the change in grep project: > > a95156247098 ("egrep, fgrep: now obsolete") > > > > some tests start to fail on latest Fedora system with grep-3.8-1.fc38 > > or newer version, as: > > > > generic/447 70s ... egrep: warning: egrep is obsolescent; using grep -E > > ... > > @@ -1,4 +1,5 @@ > > QA output created by 447 > > +egrep: warning: egrep is obsolescent; using grep -E > > ... > > > > So use grep -E and -F to instead of egrep and fgrep commands. > > > > Signed-off-by: Zorro Lang <zlang@kernel.org> > > --- > > common/rc | 11 +++++++++++ > > 1 file changed, 11 insertions(+) > > > > diff --git a/common/rc b/common/rc > > index a25cbcd0..dee3965e 100644 > > --- a/common/rc > > +++ b/common/rc > > @@ -30,6 +30,17 @@ dd() > > fi > > } > > > > +# The egrep and fgrep are obsolescent > > +egrep() > > +{ > > + grep -E "$@" > > +} > > + > > +fgrep() > > +{ > > + grep -F "$@" > > +} > > Why not conditionally define these *only* if the system doesn't already > have an egrep/fgrep binary? > > (Alternately I guess you could take Murphy's patch, since that's the > proper fix according to the gnu grep maintainers...) OK, let's drop this patch, turn to review Murphy's. I just hope to avoid later patches using egrep and fgrep commands. Thanks, Zorro > > --D > > > + > > # Prints the md5 checksum of a given file > > _md5_checksum() > > { > > -- > > 2.31.1 > > >
diff --git a/common/rc b/common/rc index a25cbcd0..dee3965e 100644 --- a/common/rc +++ b/common/rc @@ -30,6 +30,17 @@ dd() fi } +# The egrep and fgrep are obsolescent +egrep() +{ + grep -E "$@" +} + +fgrep() +{ + grep -F "$@" +} + # Prints the md5 checksum of a given file _md5_checksum() {
Due to the change in grep project: a95156247098 ("egrep, fgrep: now obsolete") some tests start to fail on latest Fedora system with grep-3.8-1.fc38 or newer version, as: generic/447 70s ... egrep: warning: egrep is obsolescent; using grep -E ... @@ -1,4 +1,5 @@ QA output created by 447 +egrep: warning: egrep is obsolescent; using grep -E ... So use grep -E and -F to instead of egrep and fgrep commands. Signed-off-by: Zorro Lang <zlang@kernel.org> --- common/rc | 11 +++++++++++ 1 file changed, 11 insertions(+)