Skip to content
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.

Sign up for GitHub

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

fixup! gvfs-helper: better handling of network errors #207

Merged
merged 1 commit into from
Oct 9, 2019
Merged

fixup! gvfs-helper: better handling of network errors #207

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions gvfs-helper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1974,7 +1974,7 @@ static enum gh__error_code do_sub_cmd__get(int argc, const char **argv)
}

/*
* Handle the 'get' command when in "server mode". Only call error()
* Handle the 'get' command when in "server mode". Only call error() and set ec
* for hard errors where we cannot communicate correctly with the foreground
* client process. Pass any actual data errors (such as 404's or 401's from
* the fetch back to the client process.
Expand Down Expand Up @@ -2046,11 +2046,15 @@ static enum gh__error_code do_server_subprocess_get(void)
goto cleanup;
}

ec = status.ec;
/*
* We only use status.ec to tell the client whether the request
* was complete, incomplete, or had IO errors. We DO NOT return
* this value to our caller.
*/
err = 0;
if (ec == GH__ERROR_CODE__OK)
if (status.ec == GH__ERROR_CODE__OK)
err = packet_write_fmt_gently(1, "ok\n");
else if (ec == GH__ERROR_CODE__HTTP_404)
else if (status.ec == GH__ERROR_CODE__HTTP_404)
err = packet_write_fmt_gently(1, "partial\n");
else
err = packet_write_fmt_gently(1, "error %s\n",
Expand Down Expand Up @@ -2277,6 +2281,7 @@ int cmd_main(int argc, const char **argv)
usage_with_options(main_usage, main_options);

trace2_cmd_name("gvfs-helper");
packet_trace_identity("gvfs-helper");

setup_git_directory_gently(NULL);

Expand Down