forked from cromer/pamac-classic
late fixes
This commit is contained in:
parent
6119f97126
commit
1909911197
@ -439,6 +439,7 @@ class Handler:
|
|||||||
transaction.Release()
|
transaction.Release()
|
||||||
choose_provides()
|
choose_provides()
|
||||||
transaction.check_conflicts()
|
transaction.check_conflicts()
|
||||||
|
if set(transaction_dict.keys()).intersection(transaction.to_add):
|
||||||
if transaction.init_transaction(noconflicts = True):
|
if transaction.init_transaction(noconflicts = True):
|
||||||
for pkgname in transaction.to_add:
|
for pkgname in transaction.to_add:
|
||||||
transaction.Add(pkgname)
|
transaction.Add(pkgname)
|
||||||
@ -460,11 +461,14 @@ class Handler:
|
|||||||
if response:
|
if response:
|
||||||
transaction.WarningDialog.hide()
|
transaction.WarningDialog.hide()
|
||||||
transaction.t_lock = False
|
transaction.t_lock = False
|
||||||
|
else:
|
||||||
|
transaction.t_lock = False
|
||||||
|
|
||||||
def on_EraseButton_clicked(self, *arg):
|
def on_EraseButton_clicked(self, *arg):
|
||||||
global transaction_type
|
global transaction_type
|
||||||
global transaction_dict
|
global transaction_dict
|
||||||
transaction_dict.clear()
|
transaction_dict.clear()
|
||||||
|
if transaction_type:
|
||||||
transaction_type = None
|
transaction_type = None
|
||||||
refresh_packages_list()
|
refresh_packages_list()
|
||||||
|
|
||||||
|
@ -112,8 +112,10 @@ def check_conflicts():
|
|||||||
warning = warning+'\n'
|
warning = warning+'\n'
|
||||||
warning = warning+name+' will be replaced by '+target.name
|
warning = warning+name+' will be replaced by '+target.name
|
||||||
for name in target.conflicts:
|
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)
|
to_add.remove(target.name)
|
||||||
if warning:
|
if warning:
|
||||||
warning = warning+'\n'
|
warning = warning+'\n'
|
||||||
@ -184,6 +186,7 @@ def handle_error(error):
|
|||||||
def handle_reply(reply):
|
def handle_reply(reply):
|
||||||
global t_lock
|
global t_lock
|
||||||
t_lock = False
|
t_lock = False
|
||||||
|
Release()
|
||||||
ProgressWindow.hide()
|
ProgressWindow.hide()
|
||||||
|
|
||||||
def get_updates():
|
def get_updates():
|
||||||
|
Loading…
Reference in New Issue
Block a user