mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Check cloudserver availability only for cloud repositories

Browse source 
The check used to be done for any https:// repository.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-01-12 23:55:34 +01:00 • committed by Dirk Hohndel
parent b188f00587
commit 0b0eacce30
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/git-access.c
View file

@ -586,7 +586,7 @@ int sync_with_remote(git_repository *repo, const char *remote, const char *branc
return 0; return 0;
} }
if (rt == RT_HTTPS && !canReachCloudServer()) { if (is_subsurface_cloud && !canReachCloudServer()) {
// this is not an error, just a warning message, so return 0 // this is not an error, just a warning message, so return 0
report_error("Cannot connect to cloud server, working with local copy"); report_error("Cannot connect to cloud server, working with local copy");
git_storage_update_progress(translate("gettextFromC", "Can't reach cloud server, working with local data")); git_storage_update_progress(translate("gettextFromC", "Can't reach cloud server, working with local data"));
@ -732,7 +732,7 @@ static git_repository *create_local_repo(const char *localdir, const char *remot
opts.fetch_opts.callbacks.certificate_check = certificate_check_cb; opts.fetch_opts.callbacks.certificate_check = certificate_check_cb;
opts.checkout_branch = branch; opts.checkout_branch = branch;
if (rt == RT_HTTPS && !canReachCloudServer()) if (is_subsurface_cloud && !canReachCloudServer())
return 0; return 0;
if (verbose > 1) if (verbose > 1)
fprintf(stderr, "git storage: calling git_clone()\n"); fprintf(stderr, "git storage: calling git_clone()\n");