-
Notifications
You must be signed in to change notification settings - Fork 1.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
OpenZFS 8858, 4580, 8929, 8868, 8860 - Correct use of grep #7053
Conversation
OpenZFS 8858 - /usr/bin/grep doesn't support -E option OpenZFS 4580 - /usr/bin/grep can't handle multibyte characters OpenZFS 8929 - tests are not delivered with system/test/utiltest OpenZFS 8868 - tests are not delivered with system/test/utiltest OpenZFS 8860 - Example in grep(1) is incorrect Authored by: Alexander Pyhalov <apyhalov@gmail.com> Reviewed by: Peter Tribble <peter.tribble@gmail.com> Reviewed by: Toomas Soome <tsoome@me.com> Reviewed by: Yuri Pankov <yuripv@gmx.com> Approved by: Robert Mustacchi <rm@joyent.com> Ported-by: Giuseppe Di Natale <dinatale2@llnl.gov> OpenZFS-issue: https://www.illumos.org/issues/8858 OpenZFS-commit: openzfs/openzfs@d2d52addd5
This change is obviously correct. On Linux, there is no /usr/xpg4/bin/egrep. |
@@ -410,7 +410,7 @@ function get_xattr #<obj> | |||
fi | |||
|
|||
for xattr in `runat $obj ls | \ | |||
/usr/xpg4/bin/egrep -v -e SUNWattr_ro -e SUNWattr_rw` ; do | |||
/usr/bin/egrep -v -e SUNWattr_ro -e SUNWattr_rw` ; do |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's use grep -E
instead since egrep
is already technically deprecated. Yes, I realize this throws away the only part of this OpenZFS change which was applicable for Linux. It'd be reasonable to fold this change in to #7040 and then comment in the OpenZFS tracker that this change isn't applicable for Linux.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree with @behlendorf, let's push #7040 instead of egrep.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm ok with folding this into #7040 if you don't mind refreshing it again.
Codecov Report
@@ Coverage Diff @@
## master #7053 +/- ##
=========================================
- Coverage 75.41% 75.4% -0.01%
=========================================
Files 296 296
Lines 95528 95528
=========================================
- Hits 72043 72034 -9
- Misses 23485 23494 +9
Continue to review full report at Codecov.
|
Closing. This fix was added to the #7040 stack and will be squashed when merged. |
OpenZFS 8858 - /usr/bin/grep doesn't support -E option
OpenZFS 4580 - /usr/bin/grep can't handle multibyte characters
OpenZFS 8929 - tests are not delivered with system/test/utiltest
OpenZFS 8868 - tests are not delivered with system/test/utiltest
OpenZFS 8860 - Example in grep(1) is incorrect
Authored by: Alexander Pyhalov apyhalov@gmail.com
Reviewed by: Peter Tribble peter.tribble@gmail.com
Reviewed by: Toomas Soome tsoome@me.com
Reviewed by: Yuri Pankov yuripv@gmx.com
Approved by: Robert Mustacchi rm@joyent.com
Ported-by: Giuseppe Di Natale dinatale2@llnl.gov
OpenZFS-issue: https://www.illumos.org/issues/8858
OpenZFS-commit: openzfs/openzfs@d2d52addd5
Checklist:
Signed-off-by
.