diff options
| author | Alexander Kapshuk <alexander.kapshuk@gmail.com> | 2018-05-31 22:22:47 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-07-07 17:44:52 +0200 |
| commit | 71bdd87f58f6791e50ddd7a078c47f9803c523ee (patch) | |
| tree | 18c96d3b75ea1c311701eea711962fcaf02f8977 /scripts | |
| parent | 34fe3cfda826e221d15610aa07364384bf8adb94 (diff) | |
| download | linux-stable-71bdd87f58f6791e50ddd7a078c47f9803c523ee.tar.gz linux-stable-71bdd87f58f6791e50ddd7a078c47f9803c523ee.tar.bz2 linux-stable-71bdd87f58f6791e50ddd7a078c47f9803c523ee.zip | |
ver_linux: Do not check for ver_linux pattern in version function
Checking whether output of commands matches the ver_linux pattern in
the version function is original shell implementation legacy code. When
the original implementation failed to locate a particular utility,
it generated error output along the lines of:
ver_linux:line number: command not found.
The awk implementation, does not contain the name of the script within the
body of the error message returned by the subshell when a given utility
fails to be located. The error message returned is along the lines of:
sh: name of utility: command not found
Safeguarding against the ver_linux pattern being found in the output
being parsed may thus be safely omitted.
Signed-off-by: Alexander Kapshuk <alexander.kapshuk@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/ver_linux | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/ver_linux b/scripts/ver_linux index e1dc041f903f..a6c728db05ce 100755 --- a/scripts/ver_linux +++ b/scripts/ver_linux @@ -70,7 +70,7 @@ BEGIN { function version(cmd, ver) { cmd = cmd " 2>&1" while (cmd | getline > 0) { - if (!/ver_linux/ && match($0, /[0-9]+([.]?[0-9]+)+/)) { + if (match($0, /[0-9]+([.]?[0-9]+)+/)) { ver = substr($0, RSTART, RLENGTH) break } |