]>
Commit | Line | Data |
---|---|---|
3b18414e JB |
1 | --- PackageKit-1.0.11/backends/zypp/pk-backend-zypp.cpp.orig 2015-11-30 17:18:58.487752181 +0100 |
2 | +++ PackageKit-1.0.11/backends/zypp/pk-backend-zypp.cpp 2015-11-30 17:45:58.811017517 +0100 | |
3 | @@ -3577,7 +3577,6 @@ | |
4 | const gchar *proxy_http; | |
5 | const gchar *proxy_https; | |
6 | const gchar *proxy_ftp; | |
7 | - const gchar *uri; | |
8 | const gchar *proxy_socks; | |
9 | const gchar *no_proxy; | |
10 | const gchar *pac; | |
11 | @@ -3590,33 +3589,29 @@ | |
12 | /* http_proxy */ | |
13 | proxy_http = pk_backend_job_get_proxy_http (job); | |
14 | if (!pk_strzero (proxy_http)) { | |
15 | - uri = pk_backend_convert_uri (proxy_http); | |
16 | + _cleanup_free_ gchar *uri = pk_backend_convert_uri (proxy_http); | |
17 | g_setenv ("http_proxy", uri, TRUE); | |
18 | - g_free (uri); | |
19 | } | |
20 | ||
21 | /* https_proxy */ | |
22 | proxy_https = pk_backend_job_get_proxy_https (job); | |
23 | if (!pk_strzero (proxy_https)) { | |
24 | - uri = pk_backend_convert_uri (proxy_https); | |
25 | + _cleanup_free_ gchar *uri = pk_backend_convert_uri (proxy_https); | |
26 | g_setenv ("https_proxy", uri, TRUE); | |
27 | - g_free (uri); | |
28 | } | |
29 | ||
30 | /* ftp_proxy */ | |
31 | proxy_ftp = pk_backend_job_get_proxy_ftp (job); | |
32 | if (!pk_strzero (proxy_ftp)) { | |
33 | - uri = pk_backend_convert_uri (proxy_ftp); | |
34 | + _cleanup_free_ gchar *uri = pk_backend_convert_uri (proxy_ftp); | |
35 | g_setenv ("ftp_proxy", uri, TRUE); | |
36 | - g_free (uri); | |
37 | } | |
38 | ||
39 | /* socks_proxy */ | |
40 | proxy_socks = pk_backend_job_get_proxy_socks (job); | |
41 | if (!pk_strzero (proxy_socks)) { | |
42 | - uri = pk_backend_convert_uri (proxy_socks); | |
43 | + _cleanup_free_ gchar *uri = pk_backend_convert_uri (proxy_socks); | |
44 | g_setenv ("socks_proxy", uri, TRUE); | |
45 | - g_free (uri); | |
46 | } | |
47 | ||
48 | /* no_proxy */ | |
49 | @@ -3628,9 +3623,8 @@ | |
50 | /* pac */ | |
51 | pac = pk_backend_job_get_pac (job); | |
52 | if (!pk_strzero (pac)) { | |
53 | - uri = pk_backend_convert_uri (pac); | |
54 | + _cleanup_free_ gchar *uri = pk_backend_convert_uri (pac); | |
55 | g_setenv ("pac", uri, TRUE); | |
56 | - g_free (uri); | |
57 | } | |
58 | } | |
59 |