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

Compatibility with libalpm 13.0.0 #10

Merged
cromer merged 4 commits from matthiakl/pamac-classic:libalpm_13 into master 2021-07-10 13:15:21 -04:00
Conversation 1 Commits 4 Files Changed 12 +8 -5
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4d14ca0fcf - Show all commits

13
src/pamac-system-daemon/system_daemon.vala
View File

@ -1776,8 +1776,9 @@ private void cb_event (void *ctx, Alpm.Event.Data data) {
if (system_daemon.cancellable.is_cancelled ()) { if (system_daemon.cancellable.is_cancelled ()) {
return; return;
} }
details += data.pkgdownload_file; system_daemon.emit_totaldownload (data.pkg_retrieve_total_size);
break; // event will be emitted by cb_fetch
return;
case Alpm.Event.Type.OPTDEP_REMOVAL: case Alpm.Event.Type.OPTDEP_REMOVAL:
details += data.optdep_removal_pkg.name; details += data.optdep_removal_pkg.name;
details += data.optdep_removal_optdep.compute_string (); details += data.optdep_removal_optdep.compute_string ();
@ -1910,6 +1911,8 @@ private int cb_fetch (void *ctx, string fileurl, string localpath, int force) {
var destfile = GLib.File.new_for_path (localpath + url.get_basename ()); var destfile = GLib.File.new_for_path (localpath + url.get_basename ());
var tempfile = GLib.File.new_for_path (destfile.get_path () + ".part"); var tempfile = GLib.File.new_for_path (destfile.get_path () + ".part");
system_daemon.emit_event(Alpm.Event.Type.PKG_RETRIEVE_START, 0, {url.get_basename ()});
system_daemon.curl.reset (); system_daemon.curl.reset ();
system_daemon.curl.setopt (Curl.Option.FAILONERROR, 1L); system_daemon.curl.setopt (Curl.Option.FAILONERROR, 1L);
system_daemon.curl.setopt (Curl.Option.CONNECTTIMEOUT, 30L); system_daemon.curl.setopt (Curl.Option.CONNECTTIMEOUT, 30L);
@ -2076,9 +2079,9 @@ private int cb_fetch (void *ctx, string fileurl, string localpath, int force) {
} }
private void cb_download (void* ctx, string filename, Alpm.Download.Event event_type, void* event_data) { private void cb_download (void* ctx, string filename, Alpm.Download.Event event_type, void* event_data) {
// TODO: implement alpm_cb_download if (event_type == Alpm.Download.Event.COMPLETED) {
// if (event_type == Alpm.Download.Event.COMPLETED)... system_daemon.emit_totaldownload (((Alpm.Download.Completed) event_data).total);
// system_daemon.emit_totaldownload (total); }
} }
private void cb_log (void *ctx, Alpm.LogLevel level, string fmt, va_list args) { private void cb_log (void *ctx, Alpm.LogLevel level, string fmt, va_list args) {