diff options
| author | Gerald Combs <gerald@wireshark.org> | 2017-09-25 16:18:21 -0700 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-09-26 01:37:16 +0000 |
| commit | 799f4f0e142675fab45fe1d00e5d0eba3c3ff8cd (patch) | |
| tree | 1ecaffdbd12dcc21e51500c156e901458ae8e344 /docbook | |
| parent | a8a3903e55af23bdce550a95ffe14a398fd1204c (diff) | |
Editcap: Don't treat plain -F and -T as errors.
The editcap man page says that you can pass in -F and -T without
arguments in order to get a list of valid capture and encapsulation
types. Instead of treating these as errors just print the information to
stdout and return 0.
Adjust the docbook _tools_help targets accordingly.
Change-Id: I590cbd59059dd8965299bef4434f522eff8a4e2c
Reviewed-on: https://code.wireshark.org/review/23741
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'docbook')
| -rw-r--r-- | docbook/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docbook/CMakeLists.txt b/docbook/CMakeLists.txt index 797b14fb0f..157a70b63e 100644 --- a/docbook/CMakeLists.txt +++ b/docbook/CMakeLists.txt @@ -107,7 +107,7 @@ list(APPEND WSUG_TOOLS_HELP_FILES ${th_file}) list(APPEND WSUG_TOOLS_PHONY_DEPS ${th_phony}) add_custom_command( OUTPUT ${th_phony} - COMMAND ${CMAKE_BINARY_DIR}/run/editcap -F > ${th_file} 2>&1 || true + COMMAND ${CMAKE_BINARY_DIR}/run/editcap -F > ${th_file} ) set(th_file ${CMAKE_CURRENT_SOURCE_DIR}/wsug_src/editcap-T.txt) set(th_phony editcap_T_tools_help) @@ -115,7 +115,7 @@ list(APPEND WSUG_TOOLS_HELP_FILES ${th_file}) list(APPEND WSUG_TOOLS_PHONY_DEPS ${th_phony}) add_custom_command( OUTPUT ${th_phony} - COMMAND ${CMAKE_BINARY_DIR}/run/editcap -T > ${th_file} 2>&1 || true + COMMAND ${CMAKE_BINARY_DIR}/run/editcap -T > ${th_file} ) add_custom_target(update_tools_help |