cromer/pamac-classic
2
0
Fork 3
Code Issues 2 Pull Requests 1 Releases 13 Wiki Activity

fix updater refresh

Browse Source
This commit is contained in:
guinux 2017-02-24 21:38:07 +01:00
parent 605a3d299d
commit e1a034a535
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/daemon.vala
View File

@ -201,6 +201,19 @@ namespace Pamac {
} }
} }
public void init_curl () {
curl = new Curl.Easy ();
curl->setopt (Curl.Option.FAILONERROR, 1L);
curl->setopt (Curl.Option.CONNECTTIMEOUT, 30L);
curl->setopt (Curl.Option.FILETIME, 1L);
curl->setopt (Curl.Option.FOLLOWLOCATION, 1L);
curl->setopt (Curl.Option.XFERINFOFUNCTION, cb_download);
curl->setopt (Curl.Option.LOW_SPEED_LIMIT, 1L);
curl->setopt (Curl.Option.LOW_SPEED_TIME, 30L);
curl->setopt (Curl.Option.NETRC, Curl.NetRCOption.OPTIONAL);
curl->setopt (Curl.Option.HTTPAUTH, Curl.CURLAUTH_ANY);
}
private void refresh_handle () { private void refresh_handle () {
alpm_handle = alpm_config.get_handle (); alpm_handle = alpm_config.get_handle ();
if (alpm_handle == null) { if (alpm_handle == null) {
@ -419,6 +432,7 @@ namespace Pamac {
int force = (force_refresh) ? 1 : 0; int force = (force_refresh) ? 1 : 0;
uint success = 0; uint success = 0;
cancellable.reset (); cancellable.reset ();
init_curl ();
unowned Alpm.List<unowned Alpm.DB> syncdbs = alpm_handle.syncdbs; unowned Alpm.List<unowned Alpm.DB> syncdbs = alpm_handle.syncdbs;
while (syncdbs != null) { while (syncdbs != null) {
unowned Alpm.DB db = syncdbs.data; unowned Alpm.DB db = syncdbs.data;
@ -439,6 +453,7 @@ namespace Pamac {
} }
syncdbs.next (); syncdbs.next ();
} }
delete curl;
refresh_handle (); refresh_handle ();
// We should always succeed if at least one DB was upgraded - we may possibly // We should always succeed if at least one DB was upgraded - we may possibly
// fail later with unresolved deps, but that should be rare, and would be expected // fail later with unresolved deps, but that should be rare, and would be expected