forked from cromer/pamac-classic
check fixes
This commit is contained in:
parent
7e020a5dd2
commit
5c15513f0b
@ -558,11 +558,11 @@ def check_conflicts():
|
|||||||
break
|
break
|
||||||
# get installed kernels
|
# get installed kernels
|
||||||
for item in pkgs:
|
for item in pkgs:
|
||||||
if len(item.name) == 7:
|
if len(item.name) == 7 or len(item.name) == 8:
|
||||||
installed_linux.append(item.name)
|
installed_linux.append(item.name)
|
||||||
for to_install in transaction.to_add:
|
for to_install in transaction.to_add:
|
||||||
if 'linux3' in to_install:
|
if 'linux3' in to_install:
|
||||||
if len(to_install) == 7:
|
if len(to_install) == 7 or len(to_install) == 8:
|
||||||
installed_linux.append(to_install)
|
installed_linux.append(to_install)
|
||||||
# check if new pkgs will replace installed ones
|
# check if new pkgs will replace installed ones
|
||||||
to_replace = set()
|
to_replace = set()
|
||||||
@ -647,8 +647,8 @@ def check_conflicts():
|
|||||||
# found the dep in uninstalled pkgs
|
# found the dep in uninstalled pkgs
|
||||||
found_depend = pyalpm.find_satisfier(transaction.syncpkgs.values(), depend)
|
found_depend = pyalpm.find_satisfier(transaction.syncpkgs.values(), depend)
|
||||||
if found_depend:
|
if found_depend:
|
||||||
# check if the dep is a kernel module to provide and if so, auto-select it
|
|
||||||
if found_depend.name != common.format_pkg_name(depend):
|
if found_depend.name != common.format_pkg_name(depend):
|
||||||
|
# check if the dep is a kernel module to provide and if so, auto-select it
|
||||||
if ('-modules' in depend) or ('linux' in depend):
|
if ('-modules' in depend) or ('linux' in depend):
|
||||||
for _pkg in transaction.syncpkgs.values():
|
for _pkg in transaction.syncpkgs.values():
|
||||||
if not _pkg.name in transaction.localpkgs.keys():
|
if not _pkg.name in transaction.localpkgs.keys():
|
||||||
@ -843,10 +843,7 @@ def check_conflicts():
|
|||||||
for pkg in pkg_list:
|
for pkg in pkg_list:
|
||||||
wont_be_removed.add(pkg.name)
|
wont_be_removed.add(pkg.name)
|
||||||
wont_be_removed -= to_replace
|
wont_be_removed -= to_replace
|
||||||
print(depends)
|
|
||||||
print(transaction.to_remove)
|
|
||||||
transaction.to_remove -= wont_be_removed
|
transaction.to_remove -= wont_be_removed
|
||||||
print(transaction.to_remove)
|
|
||||||
|
|
||||||
if mode:
|
if mode:
|
||||||
Window.get_window().set_cursor(None)
|
Window.get_window().set_cursor(None)
|
||||||
@ -863,6 +860,9 @@ def choose_provides(name):
|
|||||||
provides = OrderedDict()
|
provides = OrderedDict()
|
||||||
already_add = []
|
already_add = []
|
||||||
for pkg in transaction.syncpkgs.values():
|
for pkg in transaction.syncpkgs.values():
|
||||||
|
# fix if find_satisfier misbehaved
|
||||||
|
if pkg.name == name:
|
||||||
|
return [pkg]
|
||||||
for provide in pkg.provides:
|
for provide in pkg.provides:
|
||||||
if common.format_pkg_name(name) == common.format_pkg_name(provide):
|
if common.format_pkg_name(name) == common.format_pkg_name(provide):
|
||||||
if not pkg.name in provides.keys():
|
if not pkg.name in provides.keys():
|
||||||
|
Loading…
Reference in New Issue
Block a user