forked from cromer/pamac-classic
late fixes
This commit is contained in:
parent
6119f97126
commit
1909911197
@ -439,34 +439,38 @@ class Handler:
|
||||
transaction.Release()
|
||||
choose_provides()
|
||||
transaction.check_conflicts()
|
||||
if transaction.init_transaction(noconflicts = True):
|
||||
for pkgname in transaction.to_add:
|
||||
transaction.Add(pkgname)
|
||||
for pkgname in transaction.to_remove:
|
||||
transaction.Remove(pkgname)
|
||||
error = transaction.Prepare()
|
||||
if error:
|
||||
handle_error(error)
|
||||
else:
|
||||
transaction.get_to_remove()
|
||||
transaction.get_to_add()
|
||||
transaction.Release()
|
||||
if len(transaction.to_add) + len(transaction.to_remove) != 0:
|
||||
set_transaction_sum()
|
||||
ConfDialog.show_all()
|
||||
else:
|
||||
transaction.WarningDialog.format_secondary_text('Nothing to do due to packages conflicts')
|
||||
response = transaction.WarningDialog.run()
|
||||
if response:
|
||||
transaction.WarningDialog.hide()
|
||||
transaction.t_lock = False
|
||||
if set(transaction_dict.keys()).intersection(transaction.to_add):
|
||||
if transaction.init_transaction(noconflicts = True):
|
||||
for pkgname in transaction.to_add:
|
||||
transaction.Add(pkgname)
|
||||
for pkgname in transaction.to_remove:
|
||||
transaction.Remove(pkgname)
|
||||
error = transaction.Prepare()
|
||||
if error:
|
||||
handle_error(error)
|
||||
else:
|
||||
transaction.get_to_remove()
|
||||
transaction.get_to_add()
|
||||
transaction.Release()
|
||||
if len(transaction.to_add) + len(transaction.to_remove) != 0:
|
||||
set_transaction_sum()
|
||||
ConfDialog.show_all()
|
||||
else:
|
||||
transaction.WarningDialog.format_secondary_text('Nothing to do due to packages conflicts')
|
||||
response = transaction.WarningDialog.run()
|
||||
if response:
|
||||
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
|
||||
refresh_packages_list()
|
||||
if transaction_type:
|
||||
transaction_type = None
|
||||
refresh_packages_list()
|
||||
|
||||
def on_RefreshButton_clicked(self, *arg):
|
||||
transaction.do_refresh()
|
||||
|
@ -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:
|
||||
to_add.remove(common.format_pkg_name(name))
|
||||
#if common.format_pkg_name(name) in to_add:
|
||||
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():
|
||||
|
Loading…
Reference in New Issue
Block a user