From 7f27fd09fc5dd7e86104a1eaa669a17aa7e242e7 Mon Sep 17 00:00:00 2001
From: guinux <nuxgui@gmail.com>
Date: Fri, 4 Oct 2013 09:46:51 +0200
Subject: [PATCH] fix check extra-modules when install from tarball or
pamac-install
---
pamac-install.py | 21 ++--
pamac/transaction.py | 230 +++++++++++++++++++++++--------------------
2 files changed, 133 insertions(+), 118 deletions(-)
diff --git a/pamac-install.py b/pamac-install.py
index 82a0b876..9c892e8e 100644
--- a/pamac-install.py
+++ b/pamac-install.py
@@ -85,14 +85,15 @@ else:
args_str = argv[1:]
if get_pkgs(args_str):
if trans.to_add or trans.to_load:
- if trans.init(cascade = True):
- for pkg in trans.to_add:
- trans.add(pkg)
- for path in trans.to_load:
- trans.load(path)
- if trans.prepare():
- common.write_pid_file()
- trans.set_transaction_sum(True)
- transaction.ConfDialog.show()
- Gtk.main()
+ if trans.check_extra_modules():
+ if trans.init(cascade = True):
+ for pkg in trans.to_add:
+ trans.add(pkg)
+ for path in trans.to_load:
+ trans.load(path)
+ if trans.prepare():
+ common.write_pid_file()
+ trans.set_transaction_sum(True)
+ transaction.ConfDialog.show()
+ Gtk.main()
diff --git a/pamac/transaction.py b/pamac/transaction.py
index b9f04f15..a9bf1382 100644
--- a/pamac/transaction.py
+++ b/pamac/transaction.py
@@ -569,6 +569,111 @@ class Transaction():
else:
return True
+ def check_extra_modules(self):
+ to_check = []
+ if self.to_add:
+ for pkg in self.to_add:
+ to_check.append(pkg)
+ if self.to_load:
+ for path in self.to_load:
+ try:
+ pkg = self.handle.load_pkg(path)
+ if pkg:
+ to_check.append(pkg)
+ except:
+ self.handle_error(_('{pkgname} is not a valid path or package name').format(pkgname = path))
+ return False
+ already_checked = set(pkg.name for pkg in to_check)
+ depends = [to_check]
+ # get installed kernels
+ pkgs = self.localdb.search('linux3')
+ installed_linux = []
+ for pkg in pkgs:
+ if len(pkg.name) == 7 or len(pkg.name) == 8:
+ installed_linux.append(pkg.name)
+ for pkg in self.to_add:
+ if 'linux3' in pkg.name:
+ if len(pkg.name) == 7 or len(pkg.name) == 8:
+ installed_linux.append(pkg.name)
+ # start loops to check pkgs
+ i = 0
+ while depends[i]:
+ # add a empty list for new pkgs to check next loop
+ depends.append([])
+ # start to check one pkg
+ for pkg in depends[i]:
+ # check if the current pkg is a kernel and if so, check if a module is required to install
+ if 'linux3' in pkg.name:
+ for _pkg in self.localdb.pkgcache:
+ for depend in _pkg.depends:
+ if '-modules' in depend:
+ for db in self.syncdbs:
+ for __pkg in db.pkgcache:
+ if not self.get_localpkg(__pkg.name):
+ for provide in __pkg.provides:
+ for linux in installed_linux:
+ if linux in __pkg.name:
+ if common.format_pkg_name(depend) == common.format_pkg_name(provide):
+ if not pkg_in_list(__pkg, self.to_add):
+ if not __pkg.name in already_checked:
+ depends[i+1].append(__pkg)
+ already_checked.add(__pkg.name)
+ self.to_add.append(__pkg)
+ # check pkg deps
+ for depend in pkg.depends:
+ # check if dep is already installed
+ found_depend = pyalpm.find_satisfier(self.localdb.pkgcache, 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 ('-modules' in depend) or ('linux' in depend):
+ for db in self.syncdbs:
+ for _pkg in db.pkgcache:
+ if not self.get_localpkg(_pkg.name):
+ for name in _pkg.provides:
+ for linux in installed_linux:
+ if linux in _pkg.name:
+ if common.format_pkg_name(depend) == common.format_pkg_name(name):
+ if not pkg_in_list(_pkg, self.to_add):
+ if not _pkg.name in already_checked:
+ depends[i+1].append(_pkg)
+ already_checked.add(_pkg.name)
+ self.to_add.append(_pkg)
+ else:
+ # add the dep in list to check its deps in next loop
+ if not found_depend.name in already_checked:
+ depends[i+1].append(found_depend)
+ already_checked.add(found_depend.name)
+ else:
+ # found the dep in uninstalled pkgs
+ for db in self.syncdbs:
+ found_depend = pyalpm.find_satisfier(db.pkgcache, depend)
+ if found_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):
+ for db in self.syncdbs:
+ for _pkg in db.pkgcache:
+ if not self.get_localpkg(_pkg.name):
+ for name in _pkg.provides:
+ for linux in installed_linux:
+ if linux in _pkg.name:
+ if common.format_pkg_name(depend) == common.format_pkg_name(name):
+ if not pkg_in_list(_pkg, self.to_add):
+ if not _pkg.name in already_checked:
+ depends[i+1].append(_pkg)
+ already_checked.add(_pkg.name)
+ self.to_add.append(_pkg)
+ else:
+ # so the dep is not yet installed, add it in list to check its deps in next loop
+ if not found_depend.name in already_checked:
+ depends[i+1].append(found_depend)
+ already_checked.add(found_depend.name)
+ break
+ i += 1
+ # end of the loop
+ return True
+
def prepare(self):
try:
self.t.prepare()
@@ -766,114 +871,23 @@ class Transaction():
def run(self):
if self.to_add or self.to_load:
- ## check for kernel extra modules ##
- to_check = [pkg for pkg in self.to_add] + [pkg for pkg in self.to_load]
- already_checked = set(pkg.name for pkg in to_check)
- depends = [to_check]
- # get installed kernels
- pkgs = self.localdb.search('linux3')
- installed_linux = []
- for pkg in pkgs:
- if len(pkg.name) == 7 or len(pkg.name) == 8:
- installed_linux.append(pkg.name)
- for pkg in self.to_add:
- if 'linux3' in pkg.name:
- if len(pkg.name) == 7 or len(pkg.name) == 8:
- installed_linux.append(pkg.name)
- # start loops to check pkgs
- i = 0
- while depends[i]:
- # add a empty list for new pkgs to check next loop
- depends.append([])
- # start to check one pkg
- for pkg in depends[i]:
- # check if the current pkg is a kernel and if so, check if a module is required to install
- if 'linux3' in pkg.name:
- for _pkg in self.localdb.pkgcache:
- for depend in _pkg.depends:
- if '-modules' in depend:
- for db in self.syncdbs:
- for __pkg in db.pkgcache:
- if not self.get_localpkg(__pkg.name):
- for provide in __pkg.provides:
- for linux in installed_linux:
- if linux in __pkg.name:
- if common.format_pkg_name(depend) == common.format_pkg_name(provide):
- if not pkg_in_list(__pkg, self.to_add):
- if not __pkg.name in already_checked:
- depends[i+1].append(__pkg)
- already_checked.add(__pkg.name)
- self.to_add.append(__pkg)
- # check pkg deps
- for depend in pkg.depends:
- # check if dep is already installed
- found_depend = pyalpm.find_satisfier(self.localdb.pkgcache, 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 ('-modules' in depend) or ('linux' in depend):
- for db in self.syncdbs:
- for _pkg in db.pkgcache:
- if not self.get_localpkg(_pkg.name):
- for name in _pkg.provides:
- for linux in installed_linux:
- if linux in _pkg.name:
- if common.format_pkg_name(depend) == common.format_pkg_name(name):
- if not pkg_in_list(_pkg, self.to_add):
- if not _pkg.name in already_checked:
- depends[i+1].append(_pkg)
- already_checked.add(_pkg.name)
- self.to_add.append(_pkg)
- else:
- # add the dep in list to check its deps in next loop
- if not found_depend.name in already_checked:
- depends[i+1].append(found_depend)
- already_checked.add(found_depend.name)
- else:
- # found the dep in uninstalled pkgs
- for db in self.syncdbs:
- found_depend = pyalpm.find_satisfier(db.pkgcache, depend)
- if found_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):
- for db in self.syncdbs:
- for _pkg in db.pkgcache:
- if not self.get_localpkg(_pkg.name):
- for name in _pkg.provides:
- for linux in installed_linux:
- if linux in _pkg.name:
- if common.format_pkg_name(depend) == common.format_pkg_name(name):
- if not pkg_in_list(_pkg, self.to_add):
- if not _pkg.name in already_checked:
- depends[i+1].append(_pkg)
- already_checked.add(_pkg.name)
- self.to_add.append(_pkg)
- else:
- # so the dep is not yet installed, add it in list to check its deps in next loop
- if not found_depend.name in already_checked:
- depends[i+1].append(found_depend)
- already_checked.add(found_depend.name)
- break
- i += 1
- # end of the loop
-
- if self.to_add or self.to_remove or self.to_load:
- if self.init(cascade = True):
- for pkg in self.to_add:
- self.add(pkg)
- for pkg in self.to_remove:
- self.remove(pkg)
- for path in self.to_load:
- self.load(path)
- if self.prepare():
- self.set_transaction_sum(True)
- ConfDialog.show()
- while Gtk.events_pending():
- Gtk.main_iteration()
- else:
- self.handle_warning(_('Nothing to do'))
-
+ if self.check_extra_modules():
+ if self.to_add or self.to_remove or self.to_load:
+ if self.init(cascade = True):
+ for pkg in self.to_add:
+ self.add(pkg)
+ for pkg in self.to_remove:
+ self.remove(pkg)
+ for path in self.to_load:
+ self.load(path)
+ if self.prepare():
+ self.set_transaction_sum(True)
+ ConfDialog.show()
+ while Gtk.events_pending():
+ Gtk.main_iteration()
+ else:
+ self.handle_warning(_('Nothing to do'))
+
def release(self):
try:
self.t.release()
--
GitLab