sudoBash418/pamac-classic
1
0
Fork 0
forked from cromer/pamac-classic
Code Pull Requests Activity

Fix pamac-system-daemon for new libalpm version

Browse Source 
Key revocation status is no longer available, so we always try
importing keys.
This commit is contained in:
sudoBash418 2024-04-26 16:02:21 -06:00
parent 8bbacb702b
commit 825f604566
Signed by: sudoBash418
GPG Key ID: 428A24BC32A7C9AF
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1146,7 +1146,7 @@ namespace Pamac {
unowned Alpm.List<Alpm.Conflict*> list = err_data; unowned Alpm.List<Alpm.Conflict*> list = err_data;
while (list != null) { while (list != null) {
Alpm.Conflict* conflict = list.data; Alpm.Conflict* conflict = list.data;
string conflict_detail = _("%s and %s are in conflict").printf (conflict->package1, conflict->package2); string conflict_detail = _("%s and %s are in conflict").printf (conflict->package1.name, conflict->package2.name);
// only print reason if it contains new information // only print reason if it contains new information
if (conflict->reason.mod != Alpm.Depend.Mode.ANY) { if (conflict->reason.mod != Alpm.Depend.Mode.ANY) {
conflict_detail += " (%s)".printf (conflict->reason.compute_string ()); conflict_detail += " (%s)".printf (conflict->reason.compute_string ());
@ -1841,13 +1841,8 @@ private void cb_question (void *ctx, Alpm.Question.Data data) {
data.corrupted_remove = 1; data.corrupted_remove = 1;
break; break;
case Alpm.Question.Type.IMPORT_KEY: case Alpm.Question.Type.IMPORT_KEY:
if (data.import_key_key.revoked == 1) { // Auto-get key
// Do not get revoked key data.import_key_import = 1;
data.import_key_import = 0;
} else {
// Auto get not revoked key
data.import_key_import = 1;
}
break; break;
default: default:
data.any_answer = 0; data.any_answer = 0;