src/pamac-system-daemon/system_daemon.vala

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

src/vapis/libalpm.vapi

@@ -388,10 +388,6 @@ namespace Alpm {
 	public class DB {
 		public static int unregister(owned DB db);
 
-		public unowned Handle handle {
-			[CCode (cname = "alpm_db_get_handle")] get;
-		}
-
 		public unowned string name {
 			[CCode (cname = "alpm_db_get_name")] get;
 		}
@@ -430,8 +426,6 @@ namespace Alpm {
 		public int add_server(string url);
 		public int remove_server(string url);
 
-		// TODO: cache servers
-
 		public unowned Package? get_pkg(string name);
 		public unowned Group? get_group(string name);
 		public int search(Alpm.List<unowned string> needles, out Alpm.List<unowned Package> ret);
@@ -446,9 +440,6 @@ namespace Alpm {
 	[Compact]
 	public class Package {
 		/* properties */
-		public unowned Handle handle {
-			[CCode (cname = "alpm_pkg_get_handle")] get;
-		}
 		public unowned string filename {
 			[CCode (cname = "alpm_pkg_get_filename")] get;
 		}
@@ -551,9 +542,6 @@ namespace Alpm {
 		public int validation {
 			[CCode (cname = "alpm_pkg_get_validation")] get;
 		}
-		public unowned Alpm.List<unowned XData> xdata {
-			[CCode (cname = "alpm_pkg_get_xdata")] get;
-		}
 		// TODO: changelog functions
 
 		/** Package install reasons. */
@@ -562,9 +550,7 @@ namespace Alpm {
 			/** Explicitly requested by the user. */
 			EXPLICIT = 0,
 			/** Installed as a dependency for another package. */
-			DEPEND = 1,
-			/** Failed parsing of local database */
-			UNKNOWN = 2
+			DEPEND = 1
 		}
 
 		/** Location a package object was loaded from. */
@@ -599,12 +585,6 @@ namespace Alpm {
 			REMOVE
 		}
 
-		[CCode (cname = "alpm_pkg_xdata_t")]
-		public class XData {
-			public string name;
-			public string value;
-		}
-
 		public int checkmd5sum();
 		public int has_scriptlet();
 
@@ -665,8 +645,10 @@ namespace Alpm {
 	[CCode (cname = "alpm_conflict_t", free_function = "alpm_conflict_free")]
 	[Compact]
 	public class Conflict {
-		public unowned Package package1;
-		public unowned Package package2;
+		public ulong package1_hash;
+		public ulong package2_hash;
+		public string package1;
+		public string package2;
 		public unowned Depend reason;
 	}
 
@@ -1227,10 +1209,8 @@ namespace Alpm {
 			public Type type;
 			/** Answer: whether or not to import key. */
 			public int import;
-			/** UID of the key to import */
-			public string uid;
-			/** Fingerprint of the key to import */
-			public string fingerprint;
+			/** The key to import. */
+			public Signature.PGPKey key;
 		}
 
 		/** This is an union passed to the callback, that allows the frontend to know
@@ -1412,8 +1392,6 @@ namespace Alpm {
 		RECURSE = (1 << 5),
 		/** Modify database but do not commit changes to the filesystem. */
 		DBONLY = (1 << 6),
-		/** Do not run hooks during a transaction. */
-		NOHOOKS = (1 << 7),
 		/** Use ALPM_PKG_REASON_DEPEND when installing packages. */
 		ALLDEPS = (1 << 8),
 		/** Only download packages and do not actually install. */