late fixes

pamac/manager.py

@@ -439,34 +439,38 @@ class Handler:
 							transaction.Release()
 							choose_provides()
 							transaction.check_conflicts()
-					if transaction.init_transaction(noconflicts = True):
+					if set(transaction_dict.keys()).intersection(transaction.to_add):
-						for pkgname in transaction.to_add:
+						if transaction.init_transaction(noconflicts = True):
-							transaction.Add(pkgname)
+							for pkgname in transaction.to_add:
-						for pkgname in transaction.to_remove:
+								transaction.Add(pkgname)
-							transaction.Remove(pkgname)
+							for pkgname in transaction.to_remove:
-						error = transaction.Prepare()
+								transaction.Remove(pkgname)
-						if error:
+							error = transaction.Prepare()
-							handle_error(error)
+							if error:
-						else:
+								handle_error(error)
-							transaction.get_to_remove()
+							else:
-							transaction.get_to_add()
+								transaction.get_to_remove()
-							transaction.Release()
+								transaction.get_to_add()
-						if len(transaction.to_add) + len(transaction.to_remove) != 0:
+								transaction.Release()
-							set_transaction_sum()
+							if len(transaction.to_add) + len(transaction.to_remove) != 0:
-							ConfDialog.show_all()
+								set_transaction_sum()
-						else:
+								ConfDialog.show_all()
-							transaction.WarningDialog.format_secondary_text('Nothing to do due to packages conflicts')
+							else:
-							response = transaction.WarningDialog.run()
+								transaction.WarningDialog.format_secondary_text('Nothing to do due to packages conflicts')
-							if response:
+								response = transaction.WarningDialog.run()
-								transaction.WarningDialog.hide()
+								if response:
-							transaction.t_lock = False
+									transaction.WarningDialog.hide()
+								transaction.t_lock = False
+					else:
+						transaction.t_lock = False
 
 	def on_EraseButton_clicked(self, *arg):
 		global transaction_type
 		global transaction_dict
 		transaction_dict.clear()
-		transaction_type = None
+		if transaction_type:
-		refresh_packages_list()
+			transaction_type = None
+			refresh_packages_list()
 
 	def on_RefreshButton_clicked(self, *arg):
 		transaction.do_refresh()

pamac/transaction.py

@@ -112,8 +112,10 @@ def check_conflicts():
 						warning = warning+'\n'
 					warning = warning+name+' will be replaced by '+target.name
 		for name in target.conflicts:
-			if common.format_pkg_name(name) in to_add:
+			#if common.format_pkg_name(name) in to_add:
-				to_add.remove(common.format_pkg_name(name))
+			if name in to_add:
+				#to_add.remove(common.format_pkg_name(name))
+				to_add.remove(name)
 				to_add.remove(target.name)
 				if warning:
 					warning = warning+'\n'
@@ -184,6 +186,7 @@ def handle_error(error):
 def handle_reply(reply):
 	global t_lock
 	t_lock = False
+	Release()
 	ProgressWindow.hide()
 
 def get_updates():