diff options
| author | CoprDistGit <infra@openeuler.org> | 2023-04-17 07:36:31 +0000 |
|---|---|---|
| committer | CoprDistGit <infra@openeuler.org> | 2023-04-17 07:36:31 +0000 |
| commit | 5de4bc645d087edfbc848d43ac0019a6535a3c73 (patch) | |
| tree | 7354cf7f0504f1020c7c3165c77c21ef9257cbb4 /0037-change-goto-branch.patch | |
| parent | 4a79e40e226e2077b5e8cc274610e473b148f507 (diff) | |
automatic import of iSuladopeneuler20.03
Diffstat (limited to '0037-change-goto-branch.patch')
| -rw-r--r-- | 0037-change-goto-branch.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/0037-change-goto-branch.patch b/0037-change-goto-branch.patch new file mode 100644 index 0000000..a2352f4 --- /dev/null +++ b/0037-change-goto-branch.patch @@ -0,0 +1,27 @@ +From 66532035178723175ad9522201440372316dc914 Mon Sep 17 00:00:00 2001 +From: zhongtao <zhongtao17@huawei.com> +Date: Mon, 6 Mar 2023 17:54:55 +0800 +Subject: [PATCH 37/53] change goto branch + +Signed-off-by: zhongtao <zhongtao17@huawei.com> +--- + src/daemon/executor/container_cb/execution_stream.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/daemon/executor/container_cb/execution_stream.c b/src/daemon/executor/container_cb/execution_stream.c +index 1a7353b5..7e928cf7 100644 +--- a/src/daemon/executor/container_cb/execution_stream.c ++++ b/src/daemon/executor/container_cb/execution_stream.c +@@ -161,7 +161,8 @@ static int container_exec_cb(const container_exec_request *request, container_ex + + if (exec_container(cont, request, *response, stdinfd, stdout_handler, stderr_handler) != 0) { + ret = -1; +- goto pack_err_response; ++ // pack err response in exec_container, there is no need to pack here. ++ goto out; + } + + goto out; +-- +2.25.1 + |