packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib: Check for http_proxy being the empty string 

On at least one user's computer, g_getenv("http_proxy") returns the
empty string, so check for that and treat it as no proxy rather than
printing a warning.

See https://github.com/flatpak/flatpak/issues/2790

Closes: #1835
Approved by: cgwalters
This commit is contained in:
Matthew Leeds 2019-04-02 13:40:11 -07:00 committed by Atomic Bot
parent c9725d0bef
commit da57956327
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libostree/ostree-fetcher-soup.c
View File

@ -645,7 +645,7 @@ _ostree_fetcher_constructed (GObject *object)
} }
http_proxy = g_getenv ("http_proxy"); http_proxy = g_getenv ("http_proxy");
if (http_proxy != NULL) if (http_proxy != NULL && http_proxy[0] != '\0')
_ostree_fetcher_set_proxy (self, http_proxy); _ostree_fetcher_set_proxy (self, http_proxy);
/* FIXME Maybe implement GInitableIface and use g_thread_try_new() /* FIXME Maybe implement GInitableIface and use g_thread_try_new()
@ -711,7 +711,7 @@ _ostree_fetcher_set_proxy (OstreeFetcher *self,
SoupURI *proxy_uri; SoupURI *proxy_uri;
g_return_if_fail (OSTREE_IS_FETCHER (self)); g_return_if_fail (OSTREE_IS_FETCHER (self));
g_return_if_fail (http_proxy != NULL); g_return_if_fail (http_proxy != NULL && http_proxy[0] != '\0');
proxy_uri = soup_uri_new (http_proxy); proxy_uri = soup_uri_new (http_proxy);

2
src/libostree/ostree-repo-pull.c
View File

@ -3034,7 +3034,7 @@ _ostree_repo_remote_new_fetcher (OstreeRepo *self,
&http_proxy, error)) &http_proxy, error))
goto out; goto out;
if (http_proxy != NULL) if (http_proxy != NULL && http_proxy[0] != '\0')
_ostree_fetcher_set_proxy (fetcher, http_proxy); _ostree_fetcher_set_proxy (fetcher, http_proxy);
} }