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

Fix building against libalpm 14 #14

Open
sudoBash418 wants to merge 2 commits from sudoBash418/pamac-classic:master into master
pull from: sudoBash418/pamac-classic:master
merge into: cromer:master
Conversation 0 Commits 2 Files Changed 2 +3 -8
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 825f604566 - Show all commits

9
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 = 0;
} else {
// Auto get not revoked key
data.import_key_import = 1; data.import_key_import = 1;
}
break; break;
default: default:
data.any_answer = 0; data.any_answer = 0;