Skip to content

Commit 103ad3f

Browse files
committed
[lldb/Commands] Fix short option collision for process launch
This patch changes the short option used in `CommandOptionsProcessLaunch` for the `-v|--environment` command option to `-E|--environment`. The reason for that is, that it collides with the `-v|--structured-data-value` command option generated by `OptionGroupPythonClassWithDict` that I'm using in an upcoming patch for the `process launch` command. The long option `--environment` remains the same. Differential Review: https://reviews.llvm.org/D95100 Signed-off-by: Med Ismail Bennani <[email protected]>
1 parent ab45289 commit 103ad3f

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

lldb/docs/use/map.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ Execution Commands
199199
<td class="content">
200200
</td>
201201
<td class="content">
202-
<b>(lldb)</b> process launch -v DEBUG=1
202+
<b>(lldb)</b> process launch -E DEBUG=1
203203
<br>
204204
</td>
205205
</tr>

lldb/source/Commands/CommandOptionsProcessLaunch.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ Status CommandOptionsProcessLaunch::SetOptionValue(
130130
launch_info.SetShell(HostInfo::GetDefaultShell());
131131
break;
132132

133-
case 'v':
133+
case 'E':
134134
launch_info.GetEnvironment().insert(option_arg);
135135
break;
136136

lldb/source/Commands/Options.td

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,7 @@ let Command = "process launch" in {
655655
Desc<"Set the current working directory to <path> when running the inferior.">;
656656
def process_launch_arch : Option<"arch", "a">, Arg<"Architecture">,
657657
Desc<"Set the architecture for the process to launch when ambiguous.">;
658-
def process_launch_environment : Option<"environment", "v">,
658+
def process_launch_environment : Option<"environment", "E">,
659659
Arg<"None">, Desc<"Specify an environment variable name/value string "
660660
"(--environment NAME=VALUE). Can be specified multiple times for subsequent "
661661
"environment entries.">;

0 commit comments

Comments
 (0)